Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3050:

Browse Source 
- 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
This commit is contained in:
René Gielen
2009-03-20 01:16:45 +00:00
parent 30c95e8129
commit 751b92ea7d
11 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/pom.xml
+2 -2
View File
@@ -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>
core/pom.xml
+3 -3
View File
@@ -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>
plugins/codebehind/pom.xml
+3 -3
View File
@@ -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>
plugins/dojo/pom.xml
+3 -3
View File
@@ -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>
plugins/junit/pom.xml
+3 -3
View File
@@ -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>
plugins/portlet/pom.xml
+5 -5
View File
@@ -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>
plugins/rest/pom.xml
+3 -3
View File
@@ -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>
plugins/sitegraph/pom.xml
+3 -3
View File
@@ -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>
plugins/struts1/pom.xml
+3 -3
View File
@@ -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>
plugins/testng/pom.xml
+3 -3
View File
@@ -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>
pom.xml
+1
View File
@@ -80,6 +80,7 @@
<properties>
<currentVersion>${pom.version}</currentVersion>
<struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
</properties>
<profiles>