Author: woonsan
Date: Wed Jan 6 13:01:35 2010
New Revision: 896433
URL: http://svn.apache.org/viewvc?rev=896433&view=rev
Log:
APA-27: Upgrading velocity to the latest release version. Also upgrading groovy
dependency as well.
Modified:
portals/applications/demo/trunk/pom.xml
Modified: portals/applications/demo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=896433&r1=896432&r2=896433&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Wed Jan 6 13:01:35 2010
@@ -35,7 +35,7 @@
<properties>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<portals.applications.apa-gems.version>1.1-SNAPSHOT</portals.applications.apa-gems.version>
- <velocity.version>1.5</velocity.version>
+ <velocity.version>1.6.3</velocity.version>
<velocity-tools.version>1.3</velocity-tools.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
@@ -49,10 +49,8 @@
<taglibs-request.version>1.0.1</taglibs-request.version>
<javax.servlet.version>2.4</javax.servlet.version>
<javax.servlet.jsp.version>2.0</javax.servlet.jsp.version>
- <asm.version>2.2</asm.version>
- <antlr.version>2.7.6</antlr.version>
<castor.version>1.1.1-xml</castor.version>
- <groovy.version>1.1-beta-2</groovy.version>
+ <groovy.version>1.7.0</groovy.version>
<commons-collections.version>3.2</commons-collections.version>
<commons-digester.version>1.8</commons-digester.version>
<commons-lang.version>2.4</commons-lang.version>
@@ -82,11 +80,35 @@
<scope>provided</scope>
</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.applications</groupId>
<artifactId>apa-gems</artifactId>
<version>${portals.applications.apa-gems.version}</version>
@@ -120,6 +142,20 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-velocity</artifactId>
<version>${org.apache.portals.bridges.velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <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>org.apache.portals.bridges</groupId>
@@ -127,18 +163,16 @@
<version>${org.apache.portals.bridges.groovy.version}</version>
<exclusions>
<exclusion>
+ <groupId>groovy</groupId>
+ <artifactId>groovy</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>${velocity-tools.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -183,31 +217,21 @@
<version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
- <!-- for groovy -->
- <dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>${antlr.version}</version>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>${castor.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<!-- Project Information -->
