Author: wsmoak Date: Thu Dec 28 17:20:08 2006 New Revision: 490906 URL: http://svn.apache.org/viewvc?view=rev&rev=490906 Log: Upgrade the example apps to Spring 2 by removing the Spring 1.2.8 dependencies from the struts2-apps parent pom. If the example app uses the struts2-spring-plugin, it will get its Spring 2 dependencies transitively. WW-1483
Modified: struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/apps/pom.xml Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?view=diff&rev=490906&r1=490905&r2=490906 ============================================================================== --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Thu Dec 28 17:20:08 2006 @@ -34,6 +34,12 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>2.0.1</version> + <scope>test</scope> + </dependency> </dependencies> Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?view=diff&rev=490906&r1=490905&r2=490906 ============================================================================== --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Thu Dec 28 17:20:08 2006 @@ -186,35 +186,10 @@ <version>${pom.version}</version> </dependency> - <!-- Spring --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>1.2.8</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>1.2.8</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>1.2.8</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>1.2.8</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> - <version>1.2.8</version> + <version>2.0.1</version> <scope>test</scope> </dependency> </dependencies>