Author: lukaszlenart
Date: Sun Dec 9 09:45:55 2012
New Revision: 1418866
URL: http://svn.apache.org/viewvc?rev=1418866&view=rev
Log:
WW-3058 Upgrades only Velocity to 1.6.4 and cleans up poms a bit
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/osgi/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Sun Dec 9 09:45:55 2012
@@ -118,22 +118,8 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<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>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sun Dec 9 09:45:55 2012
@@ -134,23 +134,8 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
Modified: struts/struts2/trunk/bundles/demo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/demo/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/bundles/demo/pom.xml (original)
+++ struts/struts2/trunk/bundles/demo/pom.xml Sun Dec 9 09:45:55 2012
@@ -28,12 +28,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
Modified: struts/struts2/trunk/plugins/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/pom.xml (original)
+++ struts/struts2/trunk/plugins/osgi/pom.xml Sun Dec 9 09:45:55 2012
@@ -32,20 +32,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitemesh/pom.xml Sun Dec 9 09:45:55 2012
@@ -56,20 +56,8 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
</dependencies>
</project>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sun Dec 9 09:45:55 2012
@@ -379,7 +379,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
+ <version>1.6.4</version>
<optional>true</optional>
</dependency>
@@ -389,6 +389,10 @@
<version>1.3</version>
<exclusions>
<exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
</exclusion>
