You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2010/01/05 19:45:28 UTC
svn commit: r896174 - /portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
Author: woonsan
Date: Tue Jan 5 18:45:28 2010
New Revision: 896174
URL: http://svn.apache.org/viewvc?rev=896174&view=rev
Log:
JS2-1093: Upgrading velocity to 1.6.3.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=896174&r1=896173&r2=896174&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Tue Jan 5 18:45:28 2010
@@ -62,7 +62,7 @@
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<velocity-tools.version>1.3</velocity-tools.version>
- <velocity.version>1.5</velocity.version>
+ <velocity.version>1.6.3</velocity.version>
<xerces.version>2.3.0</xerces.version>
<wicket.version>1.4-rc2</wicket.version>
</properties>
@@ -126,14 +126,46 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>${velocity-tools.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sslext</groupId>
+ <artifactId>sslext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-common</artifactId>
<version>${org.apache.portals.bridges.common.version}</version>
@@ -143,11 +175,31 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-velocity</artifactId>
<version>${org.apache.portals.bridges.velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-frameworks</artifactId>
<version>${org.apache.portals.bridges.frameworks.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
@@ -191,12 +243,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>${velocity-tools.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org