log4j2 beta3

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1409702 13f79535-47bb-0310-9956-ffa450edef68

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 16c70b34ed24f12b0f3beed6ec5361815567a028..e2ef3dd74efa0a818c87e41e31d51959f6091560 100644 (file)
--- 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
@@ -97,7 +97,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <version>${log4jVersion}</version>
       <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 2d72d1a1424ce0d74e783f6b6c94b0e1e1cf7eef..4c71b6a4d7269f7bfd1a9598a2c8daa28c2bc3d4 100644 (file)
--- 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
@@ -191,7 +191,7 @@
 
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</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 79c45b04cad7a51ea7562d6fbca96fc735937f28..a17b74f9938860004f12d480e02ea95b6e762882 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -143,7 +143,7 @@
 
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
 
     <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 a25ffa5535fbcf20bc64f6113ecbe1d8d3d00cc9..d2af4a7b77cfadd9d6715520b74bf34ed2cfefb5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -282,7 +282,7 @@
 
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</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 3b052729265bea683909c74772c4b19eb3cc0b2d..0cc858adcbcd7e23654cb495eb3e10446bd61b91 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -257,7 +257,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 86f76013e79267252bb749addfb34a71c43fcabe..9c599f2c39b5f582f56305c7170bc6b4dd688e07 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -670,7 +670,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <scope>runtime</scope>
     </dependency>
     <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 fb2136e33fe4b033c96f42595eb6d2b22d9ff026..fc38798e677b5aae2535f79f88aeaa725be31df9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -113,7 +113,7 @@
 
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
 
     <dependency>

diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index ff01a8ae601740c140eaefb661e786db9564b338..afe81e40b2e8d0bf7df4e84fb2088fd8884dfeaa 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -82,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
index c3338493686c33083ff01e8a9ad6af234690e4d5..d63da761749b5565f8ea9d5b73cffc42d448127b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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.1</slf4j.version>
-    <log4j.version>2.0-beta2</log4j.version>
+    <log4j.version>2.0-beta3</log4j.version>
 
     <spring.version>3.1.3.RELEASE</spring.version>
 
@@ -1183,7 +1183,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j.adapters</groupId>
-        <artifactId>slf4j-impl</artifactId>
+        <artifactId>log4j-slf4j-impl</artifactId>
         <version>${log4j.version}</version>
         <scope>runtime</scope>
       </dependency>