diff options
19 files changed, 37 insertions, 37 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 22addc40c..934adb5af 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</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> 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 3659cb38e..e9cb236b4 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 @@ -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> diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 49c1d6dd2..613e80306 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</groupId> + <groupId>org.apache.logging.log4j.adapters</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 9873046c3..9fb663d9a 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -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> 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 690cd4e0e..e25374be1 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 @@ -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> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index e2cc4ef32..0c604ee31 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</groupId> + <groupId>org.apache.logging.log4j.adapters</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 355529317..f00a2923b 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</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> 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 3973d3a73..6746de7a4 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 @@ -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> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index fba754aaa..4d8a816d6 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</groupId> + <groupId>org.apache.logging.log4j.adapters</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 c6d269acd..fd70481c0 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index ac267f477..e0e097e38 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml index 7aab98727..fb2136e33 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index e3ca0d762..7e00a0007 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 645e20f57..7706dad2d 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -188,7 +188,7 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> + <groupId>org.apache.logging.log4j.adapters</groupId> <artifactId>log4j12-api</artifactId> </dependency> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 93fcfcbab..3c9a1439c 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</groupId> + <groupId>org.apache.logging.log4j.adapters</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 383dcf330..d8c0dce5b 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</groupId> + <groupId>org.apache.logging.log4j.adapters</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 4c32130a3..f9358641f 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -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> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index ac0f2eb73..6b5a82a53 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</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> |