You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/06/17 15:45:56 UTC
svn commit: r955595 - in /geronimo/server/branches/2.1.6:
buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/
buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
framework/configs/geronimo-gbean-d...
Author: rickmcguire
Date: Thu Jun 17 13:45:56 2010
New Revision: 955595
URL: http://svn.apache.org/viewvc?rev=955595&view=rev
Log:
Some more manual version number changes
Modified:
geronimo/server/branches/2.1.6/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.1.6/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.1.6/framework/configs/plugin/pom.xml
geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/2.1.6/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/branches/2.1.6/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1.6/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Thu Jun 17 13:45:56 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.5-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.1.6</geronimoVersion>
</properties>
Modified: geronimo/server/branches/2.1.6/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1.6/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Thu Jun 17 13:45:56 2010
@@ -24,7 +24,7 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>2.1.5-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.1.6</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.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml Thu Jun 17 13:45:56 2010
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>car</type>
</module-id>
<dependency start="true">
Modified: geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml Thu Jun 17 13:45:56 2010
@@ -25,7 +25,7 @@ specific services - those should be prov
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>car</type>
</moduleId>
<dependencies>
Modified: geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml Thu Jun 17 13:45:56 2010
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.1.5</version>
+ <version>2.1.6</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
Modified: geronimo/server/branches/2.1.6/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/configs/plugin/pom.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/2.1.6/framework/configs/plugin/pom.xml Thu Jun 17 13:45:56 2010
@@ -122,9 +122,9 @@
<plugin-artifact>
<config-xml-content>
<gbean name="DownloadedPluginRepos">
- <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.5.txt</attribute>
+ <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.6.txt</attribute>
<!--<attribute name="userRepositories">~/.m2/repository</attribute>-->
- <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.5</attribute>
+ <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.6</attribute>
</gbean>
</config-xml-content>
</plugin-artifact>
Modified: geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/2.1.6/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Thu Jun 17 13:45:56 2010
@@ -45,7 +45,7 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/2.1.5/car</dependency>
+ <dependency>geronimo/j2ee-server/2.1.6/car</dependency>
<dependency>geronimo/geronimo-daytrader-derby-db/2.0-SNAPSHOT/jar</dependency>
</plugin-artifact>
</plugin>
Modified: geronimo/server/branches/2.1.6/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=955595&r1=955594&r2=955595&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1.6/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jun 17 13:45:56 2010
@@ -34,7 +34,7 @@
<protocol>http</protocol>
<host>localhost</host>
<port>8080</port>
- <uri>/jaxrpc-war-2.1.5/servlet</uri>
+ <uri>/jaxrpc-war-2.1.6/servlet</uri>
</port>
</service-ref>