From b0d54e0f7a39c9788ce40fad538ed51452f9ea75 Mon Sep 17 00:00:00 2001
From: Wendy Smoak <wsmoak@apache.org>
Date: Sun, 28 May 2006 03:24:39 +0000
Subject: [PATCH] Move the Spring dependencies into <dependencyManagement>. Add
 build/finalName to remove the version number from the packaged webapp
 filename.

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@409914 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/pom.xml               | 17 ++++++++---------
 apps/portlet/pom.xml       |  2 +-
 apps/shopping-cart/pom.xml | 22 +++++++++++++++++++++-
 apps/showcase/pom.xml      |  4 ----
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index e903e91ae..c808de1b0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -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>
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 963147ef9..ae114fef8 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -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>
diff --git a/apps/shopping-cart/pom.xml b/apps/shopping-cart/pom.xml
index 190a28c4a..6fa321649 100644
--- a/apps/shopping-cart/pom.xml
+++ b/apps/shopping-cart/pom.xml
@@ -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>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 4e4e4d473..72261fb9f 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -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>