Author: dashorst
Date: Sat Feb 19 12:42:52 2011
New Revision: 1072320
URL: http://svn.apache.org/viewvc?rev=1072320&view=rev
Log:
Fix spring dependency to use spring-web instead of spring to improve
compatibility with spring 3
Modified:
wicket/trunk/pom.xml
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-spring/pom.xml
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1072320&r1=1072319&r2=1072320&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sat Feb 19 12:42:52 2011
@@ -33,6 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>7.2.2.v20101205</jetty.version>
+ <spring.version>2.5.6</spring.version>
</properties>
<profiles>
@@ -381,8 +382,19 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.6</version>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+
<groupId>commons-logging</groupId>
+
<artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1072320&r1=1072319&r2=1072320&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Sat Feb 19 12:42:52 2011
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: wicket/trunk/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=1072320&r1=1072319&r2=1072320&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Sat Feb 19 12:42:52 2011
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
