use log4j2

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

diff --git a/pom.xml b/pom.xml
index e46169ce54c56a636037faf68359c4307c4e35af..8417da881d99f5f4fe82a4079452aeb01b246b16 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
   <properties>
     <springVersion>3.1.3.RELEASE</springVersion>
     <slf4jVersion>1.7.1</slf4jVersion>
-    <log4jVersion>2.0-beta3</log4jVersion>
+    <log4j2Version>2.0-beta3</log4j2Version>
 
     <jacksonVersion>1.9.9</jacksonVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 1216bceffa214b6586a5c1fd5ef281f142f93924..4ae9417082d3fa9f4dc0386d2829646a9d8a7fe9 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -159,8 +159,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <groupId>org.apache.logging.log4j.adapters</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j2Version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml
deleted file mode 100644 (file)
index 8c55a1c..0000000
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <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.cxf.jaxrs.interceptor.JAXRSInInterceptor">
-    <level value="trace"/>
-  </logger>
-  <logger name="org.apache.cxf.jaxrs.utils.JAXRSUtils">
-    <level value="trace"/>
-  </logger>
-  -->
-  <logger name="org.codehaus.redback.rest.services" >
-    <level value="debug"/>
-  </logger>
-
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="console" />
-  </root>
-
-</log4j:configuration>