portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r896173 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/pom.xml pom.xml
Date Tue, 05 Jan 2010 18:44:12 GMT
Author: woonsan
Date: Tue Jan  5 18:44:12 2010
New Revision: 896173

URL: http://svn.apache.org/viewvc?rev=896173&view=rev
Log:
JS2-1093: Upgrading velocity to 1.6.3.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=896173&r1=896172&r2=896173&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Tue Jan  5 18:44:12
2010
@@ -84,11 +84,11 @@
       <artifactId>pluto-container</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity-tools</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools</artifactId>
     </dependency>
     <dependency>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=896173&r1=896172&r2=896173&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue Jan  5 18:44:12 2010
@@ -304,7 +304,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>
     <xalan.version>2.4.1</xalan.version>
     <xerces.version>2.3.0</xerces.version>
     <xml-apis.version>2.0.2</xml-apis.version>
@@ -489,6 +489,16 @@
         <groupId>org.apache.portals.applications</groupId>
         <artifactId>apa-gems</artifactId>
         <version>${org.apache.portals.applications.apa-gems.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.jetspeed-2</groupId>
@@ -887,6 +897,12 @@
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <version>${commons-beanutils.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
@@ -1254,14 +1270,32 @@
 
       <!-- Velocity -->
       <dependency>
-        <groupId>velocity</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>${velocity.version}</version>
       </dependency>
       <dependency>
-        <groupId>velocity-tools</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity-tools</artifactId>
         <version>${velocity-tools.version}</version>
+        <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>
 
       <!-- Portals Bridges -->
@@ -1282,6 +1316,14 @@
           <groupId>org.apache.portals.bridges</groupId>
           <artifactId>portals-bridges-common</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>velocity</groupId>
+          <artifactId>velocity</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>velocity-tools</groupId>
+          <artifactId>velocity-tools</artifactId>
+        </exclusion>
         </exclusions>
       </dependency>
       <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message