From f2f5cce8763c7abe3821f9e21ac45cb221a711d0 Mon Sep 17 00:00:00 2001
From: Wendy Smoak <wsmoak@apache.org>
Date: Mon, 29 May 2006 01:21:19 +0000
Subject: [PATCH] Restore the <dependencies> section in apps/pom.xml. All of
 the example apps require both struts-core and Spring.

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@410010 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/blank/pom.xml         |  6 ------
 apps/pom.xml               |  9 +++------
 apps/shopping-cart/pom.xml | 21 ---------------------
 apps/showcase/pom.xml      | 21 ---------------------
 apps/starter/pom.xml       |  7 -------
 5 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 5b6b0d9a8..6812f029f 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -20,12 +20,6 @@
          <scope>provided</scope>
       </dependency>
       
-      <dependency>
-          <groupId>org.apache.struts.action2</groupId>
-          <artifactId>struts-core</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-    
     </dependencies>
     
     <build>
diff --git a/apps/pom.xml b/apps/pom.xml
index 436a4c1b4..5d6f4e501 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -120,16 +120,14 @@
     </build>
 
     <dependencies>
+
         <dependency>
             <groupId>org.apache.struts.action2</groupId>
             <artifactId>struts-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
-    </dependencies>
 
-    <dependencyManagement>
-      <dependencies>
-        <!-- Spring -->
+      <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -160,7 +158,6 @@
             <version>1.2.6</version>
             <scope>test</scope>
         </dependency>
-      </dependencies>
-    </dependencyManagement>
+    </dependencies>
     
 </project>
diff --git a/apps/shopping-cart/pom.xml b/apps/shopping-cart/pom.xml
index c84af1312..19dec9024 100644
--- a/apps/shopping-cart/pom.xml
+++ b/apps/shopping-cart/pom.xml
@@ -25,27 +25,6 @@
           <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 72261fb9f..a4d356a2d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -41,27 +41,6 @@
             <artifactId>log4j</artifactId>
             <version>1.2.9</version>
         </dependency>
-        <!-- Spring -->
-        <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>
-       
         <dependency>
             <groupId>uk.ltd.getahead</groupId>
             <artifactId>dwr</artifactId>
diff --git a/apps/starter/pom.xml b/apps/starter/pom.xml
index c6bf5d246..2ba4c3f0b 100644
--- a/apps/starter/pom.xml
+++ b/apps/starter/pom.xml
@@ -20,13 +20,6 @@
            <scope>provided</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.struts.action2</groupId>
-            <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>  
-    
-    
     </dependencies>
     
     <build>