Author: ate
Date: Fri Apr 9 16:31:55 2010
New Revision: 932495
URL: http://svn.apache.org/viewvc?rev=932495&view=rev
Log:
JS2-1185: Upgrade to bridges-common and bridges-velocity 2.0
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
portals/jetspeed-2/portal/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=932495&r1=932494&r2=932495&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Fri Apr 9 16:31:55
2010
@@ -39,8 +39,8 @@
<properties>
<!-- Project Dependency Version Properties -->
<jetspeed-2.version>${pom.version}</jetspeed-2.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>
+
<org.apache.portals.bridges.common.version>2.0-SNAPSHOT</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.velocity.version>2.0-SNAPSHOT</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
<org.apache.portals.applications.apa-gems.version>1.1-SNAPSHOT</org.apache.portals.applications.apa-gems.version>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=932495&r1=932494&r2=932495&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Fri Apr 9 16:31:55 2010
@@ -35,7 +35,7 @@
<org.apache.pluto.version>2.0.0</org.apache.pluto.version>
<org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
<ccpp.version>1.0</ccpp.version>
-
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.common.version>2.0-SNAPSHOT</org.apache.portals.bridges.common.version>
<geronimo-servlet_2.4_spec.version>1.1.1</geronimo-servlet_2.4_spec.version>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
<javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=932495&r1=932494&r2=932495&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Apr 9 16:31:55 2010
@@ -284,9 +284,9 @@
<ojb.version>1.0.3</ojb.version>
<org.apache.derby.version>10.3.2.1</org.apache.derby.version>
<org.apache.pluto.version>2.0.1-SNAPSHOT</org.apache.pluto.version>
-
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.common.version>2.0-SNAPSHOT</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
-
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
+
<org.apache.portals.bridges.velocity.version>2.0-SNAPSHOT</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
<org.apache.portals.applications.apa-demo.version>1.1-SNAPSHOT</org.apache.portals.applications.apa-demo.version>
@@ -1321,13 +1321,6 @@
<artifactId>portals-bridges-velocity</artifactId>
<version>${org.apache.portals.bridges.velocity.version}</version>
<exclusions>
- <!-- brought in by portals-bridges-velocity (1.0.4)
- TODO: we should fix this for bridges 1.0.5
- -->
- <exclusion>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- </exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
