Author: rgielen
Date: Fri Mar 20 01:16:45 2009
New Revision: 756289
URL: http://svn.apache.org/viewvc?rev=756289&view=rev
Log:
WW-3050:
- make Spring dependency versions consistent
- added toplevel struts2.springPlatformVersion property
- upgraded deps to 2.5.6
Modified:
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/junit/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/rest/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/testng/pom.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Fri Mar 20 01:16:45 2009
@@ -225,8 +225,8 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.7</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Fri Mar 20 01:16:45 2009
@@ -300,8 +300,8 @@
<!-- Mocks for unit testing (by Spring) -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
@@ -408,7 +408,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: struts/struts2/trunk/plugins/codebehind/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/pom.xml (original)
+++ struts/struts2/trunk/plugins/codebehind/pom.xml Fri Mar 20 01:16:45 2009
@@ -60,14 +60,14 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Fri Mar 20 01:16:45 2009
@@ -231,15 +231,15 @@
<!-- Mocks for unit testing (by Spring) -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/junit/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/junit/pom.xml (original)
+++ struts/struts2/trunk/plugins/junit/pom.xml Fri Mar 20 01:16:45 2009
@@ -47,13 +47,13 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
</dependency>
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Fri Mar 20 01:16:45 2009
@@ -133,20 +133,20 @@
<!-- Mocks for unit testing (by Spring) -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-portlet</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: struts/struts2/trunk/plugins/rest/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/rest/pom.xml (original)
+++ struts/struts2/trunk/plugins/rest/pom.xml Fri Mar 20 01:16:45 2009
@@ -67,15 +67,15 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>1.2.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<optional>true</optional>
</dependency>
Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitegraph/pom.xml Fri Mar 20 01:16:45 2009
@@ -153,15 +153,15 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/struts1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/pom.xml (original)
+++ struts/struts2/trunk/plugins/struts1/pom.xml Fri Mar 20 01:16:45 2009
@@ -62,15 +62,15 @@
<!-- Mocks for unit testing (by Spring) -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/testng/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/testng/pom.xml (original)
+++ struts/struts2/trunk/plugins/testng/pom.xml Fri Mar 20 01:16:45 2009
@@ -48,13 +48,13 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.8</version>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.8</version>
+ <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=756289&r1=756288&r2=756289&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Fri Mar 20 01:16:45 2009
@@ -80,6 +80,7 @@
<properties>
<currentVersion>${pom.version}</currentVersion>
+ <struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
</properties>
<profiles>
