portals-bridges-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1648445 - /portals/bridges/bridges-velocity/trunk/pom.xml
Date Mon, 29 Dec 2014 23:11:32 GMT
Author: taylor
Date: Mon Dec 29 23:11:32 2014
New Revision: 1648445

URL: http://svn.apache.org/r1648445
Log:
PB-111: upgrading bridges deps

Modified:
    portals/bridges/bridges-velocity/trunk/pom.xml

Modified: portals/bridges/bridges-velocity/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-velocity/trunk/pom.xml?rev=1648445&r1=1648444&r2=1648445&view=diff
==============================================================================
--- portals/bridges/bridges-velocity/trunk/pom.xml (original)
+++ portals/bridges/bridges-velocity/trunk/pom.xml Mon Dec 29 23:11:32 2014
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.portals</groupId>
     <artifactId>bridges-pom</artifactId>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.portals.bridges</groupId>
@@ -27,11 +27,11 @@
   <description>Apache Portals Bridges Velocity Bridge</description>
 
   <properties>
-    <javax.servlet.version>2.4</javax.servlet.version>
+    <javax.servlet.version>3.0.1</javax.servlet.version>
     <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
-    <org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+    <org.apache.portals.bridges.common.version>2.1-SNAPSHOT</org.apache.portals.bridges.common.version>
     <velocity-tools.version>1.3</velocity-tools.version>
-    <velocity.version>1.5</velocity.version>
+    <velocity.version>1.7</velocity.version>
   </properties>
 
   <dependencies>
@@ -43,19 +43,25 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${javax.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
     <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>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.portals.bridges</groupId>



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


Mime
View raw message