You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/30 08:56:09 UTC
svn commit: r1040429 - in /geronimo/server/branches/2.2:
framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/
framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
framework/confi...
Author: genspring
Date: Tue Nov 30 07:56:08 2010
New Revision: 1040429
URL: http://svn.apache.org/viewvc?rev=1040429&view=rev
Log:
Prepare 2.2.1 release, manually update some versions in source code.
Modified:
geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.2/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/2.2/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
geronimo/server/branches/2.2/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml
geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml
Modified: geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This may be helpful in selecting the desired geronimo version -->
- <geronimoVersion>2.2</geronimoVersion>
+ <geronimoVersion>2.2.1</geronimoVersion>
</properties>
Modified: geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This may be helpful in selecting the desired geronimo version -->
- <geronimoVersion>2.2</geronimoVersion>
+ <geronimoVersion>2.2.1</geronimoVersion>
</properties>
Modified: geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This may be helpful in selecting the desired geronimo version -->
- <geronimoVersion>2.2</geronimoVersion>
+ <geronimoVersion>2.2.1</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
Modified: geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This may be helpful in selecting the desired geronimo version -->
- <geronimoVersion>2.2</geronimoVersion>
+ <geronimoVersion>2.2.1</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
Modified: geronimo/server/branches/2.2/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.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Tue Nov 30 07:56:08 2010
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<type>car</type>
</module-id>
<dependency start="false">
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</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.2.1-SNAPSHOT</version>
+ <version>2.2.1</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.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.2/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.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Tue Nov 30 07:56:08 2010
@@ -46,7 +46,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2.1</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.2-SNAPSHOT</version>
+ <version>2.2.1</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.2-SNAPSHOT</version>
+ <version>2.2.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/branches/2.2/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.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Tue Nov 30 07:56:08 2010
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Modified: geronimo/server/branches/2.2/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/2.2/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Tue Nov 30 07:56:08 2010
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -45,7 +45,7 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/2.2.1-SNAPSHOT/car</dependency>
+ <dependency>geronimo/j2ee-server/2.2.1/car</dependency>
<dependency>geronimo/geronimo-daytrader-derby-db/2.0-SNAPSHOT/jar</dependency>
</plugin-artifact>
</plugin>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>client</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/branches/2.2/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/clustering/clustering-it/clustering-test/src/main/java/org/apache/geronimo/farm/plugin/test/TestGBean.java Tue Nov 30 07:56:08 2010
@@ -66,7 +66,7 @@ public class TestGBean {
String clusterName = CLUSTER1;
String pluginListName = PLUGIN_LIST1;
int clusterSize = 1;
- JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.plugins.it/customer-jetty/2.2-SNAPSHOT/car");
+ JpaPluginInstance pluginInstance = new JpaPluginInstance("org.apache.geronimo.plugins.it/customer-jetty/2.2.1/car");
farmGBean.addPluginToCluster(clusterName, pluginListName, pluginInstance);
checkCluster(clusterName, pluginListName, clusterSize);
Modified: geronimo/server/branches/2.2/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.2/plugins/remote-deploy/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Tue Nov 30 07:56:08 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.2-SNAPSHOT</dep:version>
+ <dep:version>2.2.1</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<dep:moduleId>
<dep:groupId>org.apache.geronimo.plugins</dep:groupId>
<dep:artifactId>welcome</dep:artifactId>
- <dep:version>2.2.1-SNAPSHOT</dep:version>
+ <dep:version>2.2.1</dep:version>
</dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/pom.xml Tue Nov 30 07:56:08 2010
@@ -23,11 +23,11 @@
<parent>
<artifactId>cluster-testsuite</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</parent>
<groupId>org.superbiz.load</groupId>
<artifactId>loadbean</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<name>loadbean</name>
<dependencies>
<dependency>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-loadbean/src/main/resources/META-INF/openejb-jar.xml Tue Nov 30 07:56:08 2010
@@ -22,7 +22,7 @@ under the License.
<dep:moduleId>
<dep:groupId>org.superbiz</dep:groupId>
<dep:artifactId>load-beans</dep:artifactId>
- <dep:version>2.2.1-SNAPSHOT</dep:version>
+ <dep:version>2.2.1</dep:version>
<dep:type>car</dep:type>
</dep:moduleId>
</dep:environment>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multicast/pom.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<parent>
<artifactId>cluster-testsuite</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</parent>
<artifactId>ejb-multicast</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-multipoint/pom.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<parent>
<artifactId>cluster-testsuite</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</parent>
<artifactId>ejb-multipoint</artifactId>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/ejb-singlepoint/pom.xml Tue Nov 30 07:56:08 2010
@@ -24,7 +24,7 @@
<parent>
<artifactId>cluster-testsuite</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</parent>
<artifactId>ejb-singlepoint</artifactId>
<name>Geronimo TestSuite :: Cluster Testsuite :: EJB Singlepoint Tests</name>
Modified: geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml?rev=1040429&r1=1040428&r2=1040429&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/cluster-testsuite/pom.xml Tue Nov 30 07:56:08 2010
@@ -22,7 +22,7 @@
<parent>
<artifactId>testsuite</artifactId>
<groupId>org.apache.geronimo.testsuite</groupId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
</parent>
<artifactId>cluster-testsuite</artifactId>