diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-04-24 10:41:53 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-04-24 10:41:53 +0000 |
| commit | cadd272aa0205ef31c5779722d8bb33a2ab8b012 (patch) | |
| tree | f7af46796a187a30f827c09dacfcf64d7ea2992c | |
| parent | bcd68a2437a3b9be8cb89afefda0735e7e8a6a36 (diff) | |
| download | archiva-cadd272aa0205ef31c5779722d8bb33a2ab8b012.tar.gz archiva-cadd272aa0205ef31c5779722d8bb33a2ab8b012.zip | |
log4j2 2.0-beta5
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1471362 13f79535-47bb-0310-9956-ffa450edef68
18 files changed, 35 insertions, 35 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 6aa598506..3909e65ad 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -85,12 +85,12 @@ <artifactId>spring-beans</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>compile</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml index 71c196b28..114ae49d7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml @@ -90,19 +90,19 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <version>${log4jVersion}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <version>${log4jVersion}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <version>${log4jVersion}</version> <scope>runtime</scope> diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index fe667ded1..a13aec642 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -48,7 +48,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 42ec8edaf..4716fb244 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -83,7 +83,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index b639e97b9..168b02209 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -184,13 +184,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> @@ -226,7 +226,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 007b4c2b2..832b7610b 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -58,7 +58,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>compile</scope> </dependency> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index d6aa4c325..986217a75 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> @@ -142,7 +142,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 2390be6ce..a89d66cbe 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -275,13 +275,13 @@ <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> @@ -293,7 +293,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index e5d20db0c..c5381d524 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -63,7 +63,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index e3c08cf95..5ef279dd2 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -251,12 +251,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index 7ce043f27..a4a54e996 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -130,17 +130,17 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index c953acf69..92211804d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -706,17 +706,17 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>runtime</scope> </dependency> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 56930b5d5..06d3a966d 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -200,7 +200,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> </dependency> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 9c75dc150..1d4f1b572 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -62,7 +62,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 859d467ca..a359bd35b 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -70,7 +70,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> </dependency> <dependency> diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index 598ec38ec..000cdb411 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -55,7 +55,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 6f14f9d5f..a649a6b1f 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -76,12 +76,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> @@ -74,7 +74,7 @@ <redback.spring-utils.version>2.0</redback.spring-utils.version> <redback.taskqueue.version>2.0</redback.taskqueue.version> <slf4j.version>1.7.2</slf4j.version> - <log4j.version>2.0-beta4</log4j.version> + <log4j.version>2.0-beta5</log4j.version> <spring.version>3.2.2.RELEASE</spring.version> @@ -1188,19 +1188,19 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <version>${log4j.version}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <version>${log4j.version}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j.adapters</groupId> + <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <version>${log4j.version}</version> <scope>runtime</scope> |