From ca7d9d33ddcc15854d941432b7cab145a371b394 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 8 Sep 2012 20:53:24 +0000
Subject: [PATCH] don't use jcl-over-slf4j

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1382363 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                       |  2 +-
 .../redback-struts2-integration/pom.xml       | 31 +++++++----------
 .../src/test/resources/logback-test.xml       | 33 -------------------
 3 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100755 redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml

diff --git a/pom.xml b/pom.xml
index 1ec51d7d..37ee44f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
   <properties>
     <springVersion>3.1.2.RELEASE</springVersion>
     <slf4jVersion>1.7.0</slf4jVersion>
-    <logbackVersion>1.0.0</logbackVersion>
+    <log4jVersion>2.0-alpha2</log4jVersion>
     <jacksonVersion>1.9.8</jacksonVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <gpg.useagent>true</gpg.useagent>
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml b/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
index 99a133ab..b9085707 100644
--- a/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
+++ b/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
@@ -237,37 +237,30 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4jVersion}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>slf4j-impl</artifactId>
+      <version>${log4jVersion}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>${slf4jVersion}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jcl</artifactId>
+      <version>${log4jVersion}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <version>${logbackVersion}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4jVersion}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>${logbackVersion}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-access</artifactId>
-      <version>${logbackVersion}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j12-api</artifactId>
+      <version>${log4jVersion}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml
deleted file mode 100755
index 5af77507..00000000
--- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,33 +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.
-  -->
-<configuration debug="false">
-
-  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%-5p %c{2} : %m%n</pattern>
-    </encoder>
-  </appender>
-
- <logger name="org.springframework" level="ERROR"/>
- <logger name="com.opensymphony.xwork2" level="debug"/>
- <root level="INFO">
-    <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file