Author: olamy
Date: Sat Sep 8 20:53:24 2012
New Revision: 1382363
URL: http://svn.apache.org/viewvc?rev=1382363&view=rev
Log:
don't use jcl-over-slf4j
Removed:
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1382363&r1=1382362&r2=1382363&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Sat Sep 8 20:53:24 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml?rev=1382363&r1=1382362&r2=1382363&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml
Sat Sep 8 20:53:24 2012
@@ -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>
