From 751b92ea7d54b691efcbf80213b621ec37820f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Gielen?= <rgielen@apache.org>
Date: Fri, 20 Mar 2009 01:16:45 +0000
Subject: [PATCH] WW-3050: - make Spring dependency versions consistent - added
 toplevel struts2.springPlatformVersion property - upgraded deps to 2.5.6

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@756289 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/pom.xml               |  4 ++--
 core/pom.xml               |  6 +++---
 plugins/codebehind/pom.xml |  6 +++---
 plugins/dojo/pom.xml       |  6 +++---
 plugins/junit/pom.xml      |  6 +++---
 plugins/portlet/pom.xml    | 10 +++++-----
 plugins/rest/pom.xml       |  6 +++---
 plugins/sitegraph/pom.xml  |  6 +++---
 plugins/struts1/pom.xml    |  6 +++---
 plugins/testng/pom.xml     |  6 +++---
 pom.xml                    |  1 +
 11 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index 4153a6913..b4038a12f 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -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>
diff --git a/core/pom.xml b/core/pom.xml
index ce660e736..e8763edf6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index c8fde9c22..b739e7bf3 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -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>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index a2430430e..ee36cd0e1 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -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>
 
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 9ce30a50b..08d5af6a6 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -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>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 4a55e71e2..dd22559d5 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -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>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index dbff905b8..8e4c32851 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -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>
 
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index fe6a79fa5..d909c9909 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -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>
 
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 3aa1bd18b..3b8721d59 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -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>
 
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 52deb0095..460fef465 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 5b7de5bdc..2571921b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
 
     <properties>
         <currentVersion>${pom.version}</currentVersion>
+        <struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
     </properties>
 
     <profiles>