[MRM-1660] use log4j2

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

4 files changed, 29 insertions, 19 deletions

diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 2747ef877..645e20f57 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -187,6 +187,11 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j12-api</artifactId>
+    </dependency>
+
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index ac07043de..383dcf330 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -64,16 +64,16 @@
       <!-- could trim more, but since it's just for test we don't need to worry -->
       <exclusions>
         <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>jcl-over-slf4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jcl</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 8a8adb65f..ac0f2eb73 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -81,6 +81,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http</artifactId>
       <scope>test</scope>
diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml b/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
index c07e3a4e7..1ce090b03 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
+++ b/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
@@ -18,24 +18,24 @@
   ~ under the License.
   -->
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+<configuration status="debug">
+  <appenders>
+    <Console name="console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+    </Console>
+  </appenders>
+  <loggers>
 
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
-    </layout>
-  </appender>
+    <logger name="org.apache.archiva.stagerepository.merge" level="debug"/>
 
+    <logger name="org.springframework" level="error"/>
 
-  <logger name="org.apache.archiva.stagerepository.merge">
-    <level value="debug"/>
-  </logger>
 
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="console" />
-  </root>
+    <root level="info">
+      <appender-ref ref="console"/>
+    </root>
+  </loggers>
+</configuration>
+
 
-</log4j:configuration>