You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2005/12/11 08:14:57 UTC
svn commit: r355932 - in /geronimo/trunk: applications/magicGball/
modules/axis/ modules/directory/ modules/jetty/ modules/tomcat/
plugins/geronimo-dependency-plugin/ plugins/geronimo-deployment-plugin/
Author: dblevins
Date: Sat Dec 10 23:14:51 2005
New Revision: 355932
URL: http://svn.apache.org/viewcvs?rev=355932&view=rev
Log:
Switched the deployment and dependency plugins to 1.1.0 (from here they go 1.1.1, 1.1.2, 1.1.3...1.1.N)
Modified:
geronimo/trunk/applications/magicGball/project.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/directory/project.xml
geronimo/trunk/modules/jetty/project.xml
geronimo/trunk/modules/tomcat/project.xml
geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
Modified: geronimo/trunk/applications/magicGball/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/project.xml (original)
+++ geronimo/trunk/applications/magicGball/project.xml Sat Dec 10 23:14:51 2005
@@ -43,7 +43,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment-plugin</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_deployment_plugin_version}</version>
<type>plugin</type>
</dependency>
</dependencies>
Modified: geronimo/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Sat Dec 10 23:14:51 2005
@@ -40,7 +40,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-dependency-plugin</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_dependency_plugin_version}</version>
<type>plugin</type>
</dependency>
Modified: geronimo/trunk/modules/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/project.xml (original)
+++ geronimo/trunk/modules/directory/project.xml Sat Dec 10 23:14:51 2005
@@ -44,7 +44,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-dependency-plugin</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_dependency_plugin_version}</version>
<type>plugin</type>
</dependency>
<!-- temporary solution until appropriate xmlbeans code is ready -->
Modified: geronimo/trunk/modules/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/project.xml (original)
+++ geronimo/trunk/modules/jetty/project.xml Sat Dec 10 23:14:51 2005
@@ -44,7 +44,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-dependency-plugin</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_dependency_plugin_version}</version>
<type>plugin</type>
</dependency>
Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Sat Dec 10 23:14:51 2005
@@ -45,7 +45,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-dependency-plugin</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_dependency_plugin_version}</version>
<type>plugin</type>
</dependency>
Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties Sat Dec 10 23:14:51 2005
@@ -23,6 +23,7 @@
maven.compile.target=1.4
geronimoVersion=1.0-SNAPSHOT
+geronimo_version=1.0-SNAPSHOT
maven.multiproject.type=plugin
Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml Sat Dec 10 23:14:51 2005
@@ -23,7 +23,7 @@
<id>geronimo-dependency-plugin</id>
<name>Geronimo :: Maven Dependency Plugin</name>
<description>A plugin used to construct a geronimo-service.xml dependency list for a Geronimo module</description>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+ <currentVersion>1.1.0</currentVersion>
<dependencies>
<dependency>
@@ -47,7 +47,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
</dependencies>
Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml?rev=355932&r1=355931&r2=355932&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml Sat Dec 10 23:14:51 2005
@@ -32,37 +32,37 @@
<package>org.apache.geronimo</package>
<logo></logo>
- <currentVersion>${geronimo_version}</currentVersion>
+ <currentVersion>1.1.0</currentVersion>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>