You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/06/18 05:25:56 UTC
svn commit: r955824 - in /geronimo/server/branches/2.1: ./
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/
framework/configs/geronimo-gbean-dep...
Author: rwonly
Date: Fri Jun 18 03:25:56 2010
New Revision: 955824
URL: http://svn.apache.org/viewvc?rev=955824&view=rev
Log:
revert the changes in rev955492 since we won't release the 2.1.6 from branch 2.1, instead we create a branch 2.1.6 to do this job. Will manually update the version to 2.1.7-SNAPSHOT after the 2.1.6 release
Added:
geronimo/server/branches/2.1/RELEASE_NOTES-2.1.6-SNAPSHOT.txt
- copied unchanged from r955491, geronimo/server/branches/2.1/RELEASE_NOTES-2.1.6-SNAPSHOT.txt
Removed:
geronimo/server/branches/2.1/RELEASE_NOTES-2.1.6.txt
Modified:
geronimo/server/branches/2.1/README.txt
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1/pom.xml
Modified: geronimo/server/branches/2.1/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/README.txt?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/README.txt (original)
+++ geronimo/server/branches/2.1/README.txt Fri Jun 18 03:25:56 2010
@@ -1,5 +1,5 @@
======================================================
-Apache Geronimo v2.1.6
+Apache Geronimo v#VERSION#
http://geronimo.apache.org/
------------------------------------------------------
@@ -9,7 +9,7 @@ ______________________
Release Notes
======================
- Please read the RELEASE_NOTES-2.1.6.txt for a complete list of new features
+ Please read the RELEASE_NOTES-#VERSION#.txt for a complete list of new features
available in this release.
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf Fri Jun 18 03:25:56 2010
@@ -60,12 +60,12 @@ main is org.apache.geronimo.gshell.cli.M
load ${gshell.home}/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-*.jar
load ${gshell.home}/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-*.jar
load ${gshell.home}/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.6/geronimo-cli-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.6/geronimo-commands-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.6/geronimo-deploy-config-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.6/geronimo-deploy-jsr88-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.6/geronimo-deploy-tool-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.6/geronimo-system-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.6/geronimo-plugin-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.6/geronimo-common-*.jar
- load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.6/geronimo-crypto-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-cli/2.1.6-SNAPSHOT/geronimo-cli-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-commands/2.1.6-SNAPSHOT/geronimo-commands-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.6-SNAPSHOT/geronimo-deploy-config-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.6-SNAPSHOT/geronimo-deploy-jsr88-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-deploy-tool/2.1.6-SNAPSHOT/geronimo-deploy-tool-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-system/2.1.6-SNAPSHOT/geronimo-system-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.6-SNAPSHOT/geronimo-plugin-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-common/2.1.6-SNAPSHOT/geronimo-common-*.jar
+ load ${gshell.home}/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.6-SNAPSHOT/geronimo-crypto-*.jar
Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Fri Jun 18 03:25:56 2010
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -56,7 +56,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -110,7 +110,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Fri Jun 18 03:25:56 2010
@@ -46,7 +46,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -60,7 +60,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -123,7 +123,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Fri Jun 18 03:25:56 2010
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Fri Jun 18 03:25:56 2010
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -45,7 +45,7 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/2.1.6/car</dependency>
+ <dependency>geronimo/j2ee-server/2.1.6-SNAPSHOT/car</dependency>
<dependency>geronimo/geronimo-daytrader-derby-db/2.1/jar</dependency>
</plugin-artifact>
</plugin>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>client</artifactId>
- <version>2.1.6</version>
+ <version>2.1.6-SNAPSHOT</version>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 18 03:25:56 2010
@@ -26,7 +26,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>geronimo-remote-deploy</dep:artifactId>
- <dep:version>2.1.6</dep:version>
+ <dep:version>2.1.6-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 18 03:25:56 2010
@@ -24,7 +24,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>welcome</dep:artifactId>
- <dep:version>2.1.6</dep:version>
+ <dep:version>2.1.6-SNAPSHOT</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=955824&r1=955823&r2=955824&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Fri Jun 18 03:25:56 2010
@@ -69,7 +69,7 @@
element, and it will need to be changed manually before a release,
as the maven-release-plugin will not update this value.
-->
- <version>${version}</version>
+ <version>2.1.6-SNAPSHOT</version>
<!-- This property is required by the car:package mojo -->
<geronimoVersion>${version}</geronimoVersion>