Author: wsmoak
Date: Sat May 27 20:24:39 2006
New Revision: 409914
URL: http://svn.apache.org/viewvc?rev=409914&view=rev
Log:
Move the Spring dependencies into <dependencyManagement>.
Add build/finalName to remove the version number from the packaged webapp
filename.
Modified:
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/portlet/pom.xml
struts/action2/trunk/apps/shopping-cart/pom.xml
struts/action2/trunk/apps/showcase/pom.xml
Modified: struts/action2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==============================================================================
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sat May 27 20:24:39 2006
@@ -114,10 +114,13 @@
</configuration>
</plugin>
</plugins>
+
+ <finalName>${pom.artifactId}</finalName>
+
</build>
- <dependencies>
-
+ <dependencyManagement>
+ <dependencies>
<dependency>
<groupId>org.apache.struts.action2</groupId>
<artifactId>struts-core</artifactId>
@@ -129,28 +132,24 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>1.2.6</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.6</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>1.2.6</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>1.2.6</version>
- <optional>true</optional>
</dependency>
<dependency>
@@ -159,7 +158,7 @@
<version>1.2.6</version>
<scope>test</scope>
</dependency>
-
-
- </dependencies>
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: struts/action2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/portlet/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==============================================================================
--- struts/action2/trunk/apps/portlet/pom.xml (original)
+++ struts/action2/trunk/apps/portlet/pom.xml Sat May 27 20:24:39 2006
@@ -10,7 +10,7 @@
<groupId>org.apache.struts.action2</groupId>
<artifactId>struts-portlet</artifactId>
<packaging>war</packaging>
- <name>Portet Webapp</name>
+ <name>Portlet Webapp</name>
<dependencies>
<dependency>
<groupId>portlet-api</groupId>
Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==============================================================================
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sat May 27 20:24:39 2006
@@ -31,7 +31,27 @@
<artifactId>sitemesh</artifactId>
<version>2.2.1</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: struts/action2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==============================================================================
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sat May 27 20:24:39 2006
@@ -45,25 +45,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>1.2.6</version>
</dependency>
<dependency>
