You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2010/10/27 11:41:08 UTC
svn commit: r1027877 - in /wicket/branches/wicket-1.4.x: pom.xml
testing/wicket-threadtest/pom.xml wicket-examples/pom.xml
Author: dashorst
Date: Wed Oct 27 09:41:08 2010
New Revision: 1027877
URL: http://svn.apache.org/viewvc?rev=1027877&view=rev
Log:
WICKET-3134 Removed commons-logging from our projects, it really needs to die, hard...
Modified:
wicket/branches/wicket-1.4.x/pom.xml
wicket/branches/wicket-1.4.x/testing/wicket-threadtest/pom.xml
wicket/branches/wicket-1.4.x/wicket-examples/pom.xml
Modified: wicket/branches/wicket-1.4.x/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/pom.xml?rev=1027877&r1=1027876&r2=1027877&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/pom.xml Wed Oct 27 09:41:08 2010
@@ -403,6 +403,11 @@
<version>1.5.8</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
@@ -418,6 +423,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -454,29 +465,6 @@
<version>2.1</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.6.2</version>
@@ -490,6 +478,12 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: wicket/branches/wicket-1.4.x/testing/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/testing/wicket-threadtest/pom.xml?rev=1027877&r1=1027876&r2=1027877&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/testing/wicket-threadtest/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/testing/wicket-threadtest/pom.xml Wed Oct 27 09:41:08 2010
@@ -65,5 +65,9 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: wicket/branches/wicket-1.4.x/wicket-examples/pom.xml
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-examples/pom.xml?rev=1027877&r1=1027876&r2=1027877&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-examples/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/wicket-examples/pom.xml Wed Oct 27 09:41:08 2010
@@ -102,6 +102,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>