You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/04/15 20:53:21 UTC

svn commit: r648376 - in /geronimo/server/branches/2.1: buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/ buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/ framework/configs/geronimo-gbean-dep...

Author: jbohn
Date: Tue Apr 15 11:53:08 2008
New Revision: 648376

URL: http://svn.apache.org/viewvc?rev=648376&view=rev
Log:
move updates for branches/2.1 to update version to 2.1.2-SNAPSHOT

Modified:
    geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml
    geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/2.1/plugins/monitoring/pom.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/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Apr 15 11:53:08 2008
@@ -8,7 +8,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1.2-SNAPSHOT</geronimoVersion>
 
     </properties>
 

Modified: geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Tue Apr 15 11:53:08 2008
@@ -8,7 +8,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1.2-SNAPSHOT</geronimoVersion>
 
     </properties>
 

Modified: geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Apr 15 11:53:08 2008
@@ -8,7 +8,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1.2-SNAPSHOT</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/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Tue Apr 15 11:53:08 2008
@@ -8,7 +8,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1.2-SNAPSHOT</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/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/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-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 15 11:53:08 2008
@@ -26,7 +26,7 @@
         <module-id>
             <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>car</type>
         </module-id>
         <dependency start="true">

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/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-2/src/test/resources/META-INF/plan.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/src/test/resources/META-INF/plan.xml Tue Apr 15 11:53:08 2008
@@ -25,7 +25,7 @@
     <moduleId>
       <groupId>org.apache.geronimo.buildsupport.it</groupId>
       <artifactId>j2ee-system</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>2.1.2-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Tue Apr 15 11:53:08 2008
@@ -215,7 +215,7 @@
 
                     <category>Geronimo Core</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+                    <geronimoVersion>2.1.2-SNAPSHOT</geronimoVersion>
                     <dependencies>
                         <dependency>
                             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/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/src/test/resources/META-INF/geronimo-plugin.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 15 11:53:08 2008
@@ -26,7 +26,7 @@
         <module-id>
             <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</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.1.1-SNAPSHOT</version>
+            <version>2.1.2-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.1-SNAPSHOT</version>
+            <version>2.1.2-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.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
     </plugin-artifact>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/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/src/test/resources/META-INF/plan.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml Tue Apr 15 11:53:08 2008
@@ -25,7 +25,7 @@
     <moduleId>
       <groupId>org.apache.geronimo.buildsupport.it</groupId>
       <artifactId>j2ee-system</artifactId>
-      <version>2.1.1-SNAPSHOT</version>
+      <version>2.1.2-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>
@@ -46,7 +46,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-common</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -60,7 +60,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-crypto</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -123,7 +123,7 @@
       <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-system</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/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-2/src/test/resources/META-INF/geronimo-plugin.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-2/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 15 11:53:08 2008
@@ -26,7 +26,7 @@
         <module-id>
             <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>car-maven-plugin</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>jar</type>
         </module-id>
         <jvm-version>1.5</jvm-version>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/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/src/test/resources/META-INF/geronimo-plugin.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration/src/test/resources/META-INF/geronimo-plugin.xml Tue Apr 15 11:53:08 2008
@@ -26,7 +26,7 @@
         <module-id>
             <groupId>org.apache.geronimo.buildsupport.it</groupId>
             <artifactId>car-maven-plugin</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>jar</type>
         </module-id>
         <jvm-version>1.5</jvm-version>
@@ -53,7 +53,7 @@
         <dependency start="false">
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
         </dependency>
         <obsoletes>
             <groupId>commons-logging</groupId>

Modified: geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/j2ee-deployer/pom.xml Tue Apr 15 11:53:08 2008
@@ -135,7 +135,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-j2ee-schema</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
@@ -156,55 +156,55 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-server</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-test-ddbean</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-naming-builder</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-security-builder</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>server-security-config</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-j2ee-builder</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-client</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
@@ -218,7 +218,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-web-2.5-builder</artifactId>
-                            <version>2.1.1-SNAPSHOT</version>
+                            <version>2.1.2-SNAPSHOT</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1/plugins/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml Tue Apr 15 11:53:08 2008
@@ -30,7 +30,7 @@
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.configs</dep:groupId>
                 <dep:artifactId>system-database</dep:artifactId>
-                <dep:version>2.1.1-SNAPSHOT</dep:version>
+                <dep:version>2.1.2-SNAPSHOT</dep:version>
                 <dep:type>car</dep:type>
             </dep:dependency>
         </dep:dependencies>

Modified: geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml Tue Apr 15 11:53:08 2008
@@ -37,14 +37,14 @@
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>mejb</artifactId>
-                <version>2.1.1-SNAPSHOT</version>
+                <version>2.1.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>j2ee-security</artifactId>
-                <version>2.1.1-SNAPSHOT</version>
+                <version>2.1.2-SNAPSHOT</version>
                 <type>car</type>
             </dependency>
         </dependencies>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Apr 15 11:53:08 2008
@@ -21,7 +21,7 @@
         <moduleId>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-war</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>war</type>
         </moduleId>
         

Modified: geronimo/server/branches/2.1/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/pom.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/pom.xml Tue Apr 15 11:53:08 2008
@@ -46,8 +46,8 @@
               element, and it will need to be changed manually before a release,
               as the maven-release-plugin will not update this value.
         -->
-        <monitoringConsoleVersion>2.1.1-SNAPSHOT</monitoringConsoleVersion>
-        <consoleVersion>2.1.1-SNAPSHOT</consoleVersion>
+        <monitoringConsoleVersion>2.1.2-SNAPSHOT</monitoringConsoleVersion>
+        <consoleVersion>2.1.2-SNAPSHOT</consoleVersion>
     </properties>
 
     <dependencies>

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=648376&r1=648375&r2=648376&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 Tue Apr 15 11:53:08 2008
@@ -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.1-SNAPSHOT</dep:version>
+        <dep:version>2.1.2-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=648376&r1=648375&r2=648376&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 Tue Apr 15 11:53:08 2008
@@ -24,7 +24,7 @@
     <dep:moduleId>
       <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
       <dep:artifactId>welcome</dep:artifactId>
-      <dep:version>2.1.1-SNAPSHOT</dep:version>
+      <dep:version>2.1.2-SNAPSHOT</dep:version>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml Tue Apr 15 11:53:08 2008
@@ -20,7 +20,7 @@
         <moduleId>
             <groupId>default</groupId>
             <artifactId>sec-ejb</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <dependencies>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Apr 15 11:53:08 2008
@@ -21,7 +21,7 @@
         <moduleId>
             <groupId>default</groupId>
             <artifactId>sec-war</artifactId>
-            <version>2.1.1-SNAPSHOT</version>
+            <version>2.1.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <dependencies>

Modified: geronimo/server/branches/2.1/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/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=648376&r1=648375&r2=648376&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Apr 15 11:53:08 2008
@@ -34,7 +34,7 @@
       <protocol>http</protocol>
       <host>localhost</host>
       <port>8080</port>
-      <uri>/jaxrpc-war-2.1.1-SNAPSHOT/servlet</uri>
+      <uri>/jaxrpc-war-2.1.2-SNAPSHOT/servlet</uri>
    </port>
  </service-ref>