portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r896431 - in /portals/applications/rss/trunk: rss-jar/pom.xml rss-war/pom.xml
Date Wed, 06 Jan 2010 13:00:11 GMT
Author: woonsan
Date: Wed Jan  6 13:00:09 2010
New Revision: 896431

URL: http://svn.apache.org/viewvc?rev=896431&view=rev
Log:
APA-27: Upgrading velocity to the latest release version.

Modified:
    portals/applications/rss/trunk/rss-jar/pom.xml
    portals/applications/rss/trunk/rss-war/pom.xml

Modified: portals/applications/rss/trunk/rss-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-jar/pom.xml?rev=896431&r1=896430&r2=896431&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-jar/pom.xml (original)
+++ portals/applications/rss/trunk/rss-jar/pom.xml Wed Jan  6 13:00:09 2010
@@ -34,7 +34,8 @@
     <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>
     <spring.version>2.5.6</spring.version>
-    <velocity.version>1.5</velocity.version>
+    <velocity.version>1.6.3</velocity.version>
+    <velocity-tools.version>1.3</velocity-tools.version>
     <rome.version>0.8</rome.version>
     <rome.version>0.8</rome.version>
     <jdom.version>1.0</jdom.version>
@@ -68,13 +69,51 @@
       <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>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.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>

Modified: portals/applications/rss/trunk/rss-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/rss/trunk/rss-war/pom.xml?rev=896431&r1=896430&r2=896431&view=diff
==============================================================================
--- portals/applications/rss/trunk/rss-war/pom.xml (original)
+++ portals/applications/rss/trunk/rss-war/pom.xml Wed Jan  6 13:00:09 2010
@@ -31,9 +31,8 @@
   <properties>
     <javax.servlet.version>2.4</javax.servlet.version>
     <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
-    <velocity-tools.version>1.3</velocity-tools.version>
     <commons-digester.version>1.8</commons-digester.version>
-    <commons-lang.version>2.1</commons-lang.version>
+    <commons-lang.version>2.4</commons-lang.version>
     <commons-collections.version>3.2</commons-collections.version>
     <oro.version>2.0.8</oro.version>
     <slf4j.version>1.5.6</slf4j.version>



Mime
View raw message