You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/05/29 03:21:20 UTC

svn commit: r410010 - in /struts/action2/trunk/apps: blank/pom.xml pom.xml shopping-cart/pom.xml showcase/pom.xml starter/pom.xml

Author: wsmoak
Date: Sun May 28 18:21:19 2006
New Revision: 410010

URL: http://svn.apache.org/viewvc?rev=410010&view=rev
Log:
Restore the <dependencies> section in apps/pom.xml.  
All of the example apps require both struts-core and Spring.

Modified:
    struts/action2/trunk/apps/blank/pom.xml
    struts/action2/trunk/apps/pom.xml
    struts/action2/trunk/apps/shopping-cart/pom.xml
    struts/action2/trunk/apps/showcase/pom.xml
    struts/action2/trunk/apps/starter/pom.xml

Modified: struts/action2/trunk/apps/blank/pom.xml
URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/blank/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==============================================================================
--- struts/action2/trunk/apps/blank/pom.xml (original)
+++ struts/action2/trunk/apps/blank/pom.xml Sun May 28 18:21:19 2006
@@ -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>

Modified: struts/action2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==============================================================================
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sun May 28 18:21:19 2006
@@ -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>

Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==============================================================================
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sun May 28 18:21:19 2006
@@ -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>

Modified: struts/action2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==============================================================================
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sun May 28 18:21:19 2006
@@ -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>

Modified: struts/action2/trunk/apps/starter/pom.xml
URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/starter/pom.xml?rev=410010&r1=410009&r2=410010&view=diff
==============================================================================
--- struts/action2/trunk/apps/starter/pom.xml (original)
+++ struts/action2/trunk/apps/starter/pom.xml Sun May 28 18:21:19 2006
@@ -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>