git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1388727 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M3
@@ -85,12 +85,12 @@ | |||
<artifactId>spring-beans</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>compile</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>compile</scope> | |||
</dependency> |
@@ -84,19 +84,19 @@ | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<version>${log4jVersion}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<version>${log4jVersion}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<version>${log4jVersion}</version> | |||
<scope>runtime</scope> |
@@ -48,7 +48,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> |
@@ -87,7 +87,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> |
@@ -172,13 +172,13 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
@@ -214,7 +214,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -58,7 +58,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>compile</scope> | |||
</dependency> |
@@ -93,7 +93,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
@@ -136,7 +136,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
</dependency> | |||
@@ -269,13 +269,13 @@ | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
@@ -287,7 +287,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -63,7 +63,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -135,12 +135,12 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -660,17 +660,17 @@ | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> |
@@ -107,17 +107,17 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
</dependency> | |||
@@ -327,7 +327,7 @@ | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
@@ -337,7 +337,7 @@ | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> |
@@ -188,7 +188,7 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
</dependency> | |||
@@ -62,7 +62,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -70,7 +70,7 @@ | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
</dependency> | |||
<dependency> |
@@ -66,7 +66,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -76,12 +76,12 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<scope>test</scope> | |||
</dependency> |
@@ -75,7 +75,7 @@ | |||
<redback.spring-utils.version>2.0-SNAPSHOT</redback.spring-utils.version> | |||
<redback.taskqueue.version>2.0-SNAPSHOT</redback.taskqueue.version> | |||
<slf4j.version>1.7.1</slf4j.version> | |||
<log4j.version>2.0-alpha2</log4j.version> | |||
<log4j.version>2.0-beta1</log4j.version> | |||
<spring.version>3.1.2.RELEASE</spring.version> | |||
@@ -1200,19 +1200,19 @@ | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>slf4j-impl</artifactId> | |||
<version>${log4j.version}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j-jcl</artifactId> | |||
<version>${log4j.version}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
<groupId>org.apache.logging.log4j.adapters</groupId> | |||
<artifactId>log4j12-api</artifactId> | |||
<version>${log4j.version}</version> | |||
<scope>runtime</scope> |