struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r941709 - in /struts/struts2/trunk: apps/portlet/pom.xml apps/showcase/pom.xml bundles/demo/pom.xml plugins/dojo/pom.xml plugins/osgi/pom.xml plugins/portlet/pom.xml plugins/sitemesh/pom.xml
Date Thu, 06 May 2010 13:08:16 GMT
Author: lukaszlenart
Date: Thu May  6 13:08:16 2010
New Revision: 941709

URL: http://svn.apache.org/viewvc?rev=941709&view=rev
Log:
Clean up Velocity version and dependency

Modified:
    struts/struts2/trunk/apps/portlet/pom.xml
    struts/struts2/trunk/apps/showcase/pom.xml
    struts/struts2/trunk/bundles/demo/pom.xml
    struts/struts2/trunk/plugins/dojo/pom.xml
    struts/struts2/trunk/plugins/osgi/pom.xml
    struts/struts2/trunk/plugins/portlet/pom.xml
    struts/struts2/trunk/plugins/sitemesh/pom.xml

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Thu May  6 13:08:16 2010
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -130,6 +130,10 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
 			<exclusions>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
 				<exclusion>
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Thu May  6 13:08:16 2010
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -134,6 +134,10 @@
             <version>1.3</version>
             <exclusions>
                 <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>

Modified: struts/struts2/trunk/bundles/demo/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/demo/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/bundles/demo/pom.xml (original)
+++ struts/struts2/trunk/bundles/demo/pom.xml Thu May  6 13:08:16 2010
@@ -20,15 +20,21 @@
     <dependencies>
        
         <dependency>
-            <groupId>velocity</groupId>
+            <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
-            <groupId>velocity-tools</groupId>
+            <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Thu May  6 13:08:16 2010
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
             <optional>true</optional>
         </dependency>
 

Modified: struts/struts2/trunk/plugins/osgi/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/pom.xml (original)
+++ struts/struts2/trunk/plugins/osgi/pom.xml Thu May  6 13:08:16 2010
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
         </dependency>
 
         <dependency>
@@ -36,6 +36,10 @@
             <version>1.3</version>
             <exclusions>
                 <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>

Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Thu May  6 13:08:16 2010
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -75,6 +75,10 @@
             <optional>true</optional>
             <exclusions>
                 <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>struts</groupId>
                     <artifactId>struts</artifactId>
                 </exclusion>

Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=941709&r1=941708&r2=941709&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitemesh/pom.xml Thu May  6 13:08:16 2010
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
+            <version>1.6.3</version>
             <optional>true</optional>
         </dependency>
 
@@ -60,6 +60,10 @@
             <optional>true</optional>
             <exclusions>
                 <exclusion>
+                    <groupId>velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>struts</groupId>
                     <artifactId>struts</artifactId>
                 </exclusion>



Mime
View raw message