You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/05/07 19:42:38 UTC
svn commit: r654191 - in /geronimo/server/trunk: pom.xml repository/pom.xml
Author: dwoods
Date: Wed May 7 10:42:36 2008
New Revision: 654191
URL: http://svn.apache.org/viewvc?rev=654191&view=rev
Log:
GERONIMO-3992 Switch to a Pluto 1.1.6 based patch build. Also included properties for other depend versions like we have in branches/2.1
Modified:
geronimo/server/trunk/pom.xml
geronimo/server/trunk/repository/pom.xml
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=654191&r1=654190&r2=654191&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed May 7 10:42:36 2008
@@ -92,6 +92,15 @@
<dojoVersion>1.1.0</dojoVersion>
<dojoLegacyVersion>0.4.3</dojoLegacyVersion>
+ <cxfVersion>2.0.2-incubator</cxfVersion>
+
+ <axis2Version>1.3</axis2Version>
+ <axiomVersion>1.2.5</axiomVersion>
+ <springVersion>2.0.5</springVersion>
+ <plutoVersion>1.1.6-G643117</plutoVersion>
+
+ <wadiVersion>2.0-SNAPSHOT</wadiVersion>
+
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
@@ -1066,25 +1075,25 @@
<dependency>
<groupId>org.codehaus.wadi</groupId>
<artifactId>wadi-aop</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${wadiVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.wadi</groupId>
<artifactId>wadi-core</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${wadiVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.wadi</groupId>
<artifactId>wadi-group</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${wadiVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.wadi</groupId>
<artifactId>wadi-tribes</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${wadiVersion}</version>
</dependency>
<dependency>
@@ -1192,13 +1201,13 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.woden</groupId>
@@ -1210,31 +1219,31 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
- <version>1.3</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
@@ -1246,7 +1255,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>${axiomVersion}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -1258,7 +1267,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>${axiomVersion}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -1270,7 +1279,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
- <version>1.2.5</version>
+ <version>${axiomVersion}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -1460,7 +1469,7 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal-driver</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -1512,7 +1521,7 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-portal-driver-impl</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -1560,25 +1569,25 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-impl</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-api</artifactId>
- <version>1.2.0-G601061</version>
+ <version>${plutoVersion}</version>
</dependency>
<!-- archive support -->
@@ -1609,43 +1618,41 @@
</dependency>
<!-- Spring Plugin -->
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0.5</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.0.5</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.5</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.5</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.5</version>
+ <version>${springVersion}</version>
</dependency>
<!-- CXF Plugin -->
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1661,7 +1668,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-metacode</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1677,7 +1684,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1693,7 +1700,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1713,7 +1720,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1729,7 +1736,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1745,7 +1752,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1765,7 +1772,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1785,7 +1792,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1801,7 +1808,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1821,7 +1828,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
- <version>2.0.2-incubator</version>
+ <version>${cxfVersion}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=654191&r1=654190&r2=654191&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Wed May 7 10:42:36 2008
@@ -100,7 +100,7 @@
<version>3.2-r579367</version>
</dependency>
- <!-- Added for private build of pluto (not ready to release yet) -->
+ <!-- Added for patched build of Pluto 1.1.6-G643117 -->
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container</artifactId>