You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/08/02 07:24:06 UTC
svn commit: r226951 - in /geronimo/branches/v1_0_M4-QA:
modules/assembly/src/plan/ modules/client-builder/src/test-resources/plans/
modules/tomcat/src/plan/ plugins/geronimo-assembly-plugin/
plugins/maven-xpom-plugin/
Author: djencks
Date: Mon Aug 1 22:24:01 2005
New Revision: 226951
URL: http://svn.apache.org/viewcvs?rev=226951&view=rev
Log:
more SNAPSHOT removal. This time I searched
Modified:
geronimo/branches/v1_0_M4-QA/modules/assembly/src/plan/j2ee-client-plan.xml
geronimo/branches/v1_0_M4-QA/modules/client-builder/src/test-resources/plans/plan2.xml
geronimo/branches/v1_0_M4-QA/modules/tomcat/src/plan/tomcat-plan.xml
geronimo/branches/v1_0_M4-QA/plugins/geronimo-assembly-plugin/project.xml
geronimo/branches/v1_0_M4-QA/plugins/maven-xpom-plugin/project.xml
Modified: geronimo/branches/v1_0_M4-QA/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/assembly/src/plan/j2ee-client-plan.xml?rev=226951&r1=226950&r2=226951&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/assembly/src/plan/j2ee-client-plan.xml Mon Aug 1 22:24:01 2005
@@ -87,22 +87,6 @@
<uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
</dependency>
-<!-- <dependency>-->
-<!-- <uri>scout/jars/jaxr-api-1.0-SNAPSHOT.jar</uri>-->
-<!-- </dependency>-->
-<!---->
-<!-- <dependency>-->
-<!-- <uri>scout/jars/scout-1.0-SNAPSHOT.jar</uri>-->
-<!-- </dependency>-->
-<!---->
-<!-- <dependency>-->
-<!-- <uri>juddi/jars/juddi-SNAPSHOT.jar</uri>-->
-<!-- </dependency>-->
-<!---->
-<!-- <dependency>-->
-<!-- <uri>jdom/jars/jdom-1.0.jar</uri>-->
-<!-- </dependency>-->
-<!---->
<!--client connector support-->
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
Modified: geronimo/branches/v1_0_M4-QA/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/client-builder/src/test-resources/plans/plan2.xml?rev=226951&r1=226950&r2=226951&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/client-builder/src/test-resources/plans/plan2.xml Mon Aug 1 22:24:01 2005
@@ -8,7 +8,7 @@
<target-name>DefaultDatabase</target-name>
</resource-ref>
<resource>
- <external-rar>tranql/rars/tranql-connector-1.0-SNAPSHOT</external-rar>
+ <external-rar>tranql/rars/tranql-connector-${tranql_connector_version}</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
version="1.5"
configId="org/apache/geronimo/DefaultDatabase"
Modified: geronimo/branches/v1_0_M4-QA/modules/tomcat/src/plan/tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/tomcat/src/plan/tomcat-plan.xml?rev=226951&r1=226950&r2=226951&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/tomcat/src/plan/tomcat-plan.xml Mon Aug 1 22:24:01 2005
@@ -28,10 +28,10 @@
>
<dependency>
- <uri>geronimo/jars/geronimo-tomcat-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-system-1.0-SNAPSHOT.jar</uri>
+ <uri>geronimo/jars/geronimo-system-${geronimo_version}.jar</uri>
</dependency>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc3.jar</uri>
Modified: geronimo/branches/v1_0_M4-QA/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/plugins/geronimo-assembly-plugin/project.xml?rev=226951&r1=226950&r2=226951&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/v1_0_M4-QA/plugins/geronimo-assembly-plugin/project.xml Mon Aug 1 22:24:01 2005
@@ -23,18 +23,18 @@
<id>geronimo-assembly-plugin</id>
<name>Geronimo Assembly Plugin</name>
<description>A plugin used to assemble a distribution of Geronimo</description>
- <currentVersion>SNAPSHOT</currentVersion>
+ <currentVersion>1.0-M4</currentVersion>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>1.0-M4</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>1.0-M4-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
Modified: geronimo/branches/v1_0_M4-QA/plugins/maven-xpom-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/plugins/maven-xpom-plugin/project.xml?rev=226951&r1=226950&r2=226951&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/plugins/maven-xpom-plugin/project.xml (original)
+++ geronimo/branches/v1_0_M4-QA/plugins/maven-xpom-plugin/project.xml Mon Aug 1 22:24:01 2005
@@ -19,7 +19,7 @@
<project>
<pomVersion>3</pomVersion>
<!--extend>${basedir}/../../etc/project.xml</extend-->
-
+
<groupId>geronimo</groupId>
<id>geronimo-xpom-plugin</id>
<name>Geronimo maven xpom plugin</name>
@@ -32,8 +32,8 @@
<package>org.apache.geronimo</package>
<logo></logo>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
-
+ <currentVersion>1.0-M4</currentVersion>
+
<dependencies>
<dependency>