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 14:37:02 UTC

svn commit: r1027940 - in /wicket/trunk: ./ pom.xml testing/wicket-threadtest/pom.xml wicket-examples/ wicket-examples/pom.xml wicket/

Author: dashorst
Date: Wed Oct 27 12:37:02 2010
New Revision: 1027940

URL: http://svn.apache.org/viewvc?rev=1027940&view=rev
Log:
WICKET-3134 Removed commons-logging from our projects, it really needs to die, hard...

Modified:
    wicket/trunk/   (props changed)
    wicket/trunk/pom.xml
    wicket/trunk/testing/wicket-threadtest/pom.xml
    wicket/trunk/wicket/   (props changed)
    wicket/trunk/wicket-examples/   (props changed)
    wicket/trunk/wicket-examples/pom.xml

Propchange: wicket/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 12:37:02 2010
@@ -1,3 +1,3 @@
-/wicket/branches/wicket-1.4.x:963681
+/wicket/branches/wicket-1.4.x:963681,1027877
 /wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355
 /wicket/trunk/wicket-devutils:760352

Modified: wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1027940&r1=1027939&r2=1027940&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Wed Oct 27 12:37:02 2010
@@ -433,6 +433,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.13</version>
@@ -442,6 +447,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>
@@ -484,29 +495,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>
@@ -520,6 +508,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/trunk/testing/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=1027940&r1=1027939&r2=1027940&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Wed Oct 27 12:37:02 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>

Propchange: wicket/trunk/wicket/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 12:37:02 2010
@@ -1,4 +1,4 @@
 /wicket/branches/wicket-1.3.x/jdk-1.4/wicket:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905,760374,764756,769389,769440,774373,781715,781719,790879
-/wicket/branches/wicket-1.4.x/wicket:963681
+/wicket/branches/wicket-1.4.x/wicket:963681,1027877
 /wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
 /wicket/trunk/wicket-devutils/wicket:760352

Propchange: wicket/trunk/wicket-examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 12:37:02 2010
@@ -1,4 +1,4 @@
 /wicket/branches/wicket-1.3.x/jdk-1.5/wicket-examples:653211
-/wicket/branches/wicket-1.4.x/wicket-examples:963681
+/wicket/branches/wicket-1.4.x/wicket-examples:963681,1027877
 /wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-examples:760296-760351,760353-760355
 /wicket/trunk/wicket-devutils/wicket-examples:760352

Modified: wicket/trunk/wicket-examples/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1027940&r1=1027939&r2=1027940&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Wed Oct 27 12:37:02 2010
@@ -104,6 +104,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
 	</dependencies>