geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r409146 - in /geronimo/trunk: ./ applications/daytrader/ etc/ modules/system/src/test-data/ plugins/geronimo-assembly-plugin/ plugins/geronimo-dependency-plugin/ plugins/geronimo-deployment-plugin/ plugins/geronimo-izpack-plugin/ plugins/ge...
Date Wed, 24 May 2006 12:12:15 GMT
Author: hogstrom
Date: Wed May 24 05:12:14 2006
New Revision: 409146

URL: http://svn.apache.org/viewvc?rev=409146&view=rev
Log:
GERONIMO-2053 - Updates to make trunk Version 1.2-SNAPSHOT

Modified:
    geronimo/trunk/applications/daytrader/project.properties
    geronimo/trunk/etc/explicit_versions.properties
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/system/src/test-data/geronimo-plugins.xml
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
    geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
    geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
    geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties
    geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties
    geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
    geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties
    geronimo/trunk/plugins/geronimo-izpack-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/daytrader/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/daytrader/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/project.properties (original)
+++ geronimo/trunk/applications/daytrader/project.properties Wed May 24 05:12:14 2006
@@ -10,8 +10,6 @@
 maven.multiproject.streamer.includes=streamer/project.xml
 maven.multiproject.jar.includes=core/project.xml,wsappclient/project.xml
 
-#geronimo_version=1.1-SNAPSHOT
-#activemq_version=3.2.1
 
 # set eclipse project name (used in eclipse plugin V1.11 onwards)
 maven.eclipse.project.name=${geronimo.maven.eclipse.applications.project.prefix}${pom.artifactId}

Modified: geronimo/trunk/etc/explicit_versions.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/etc/explicit_versions.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/etc/explicit_versions.properties (original)
+++ geronimo/trunk/etc/explicit_versions.properties Wed May 24 05:12:14 2006
@@ -7,7 +7,7 @@
 #
 activeio///=2.0-r118
 activemq///=3.2.4-SNAPSHOT
-geronimo///=1.1-SNAPSHOT
+geronimo///=1.2-SNAPSHOT
 openejb///=2.1-SNAPSHOT
 tranql/tranql//jar=1.2.3
 tranql/connector//rar=1.1

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/etc/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed May 24 05:12:14 2006
@@ -89,17 +89,17 @@
 #####################################################
 activeio_version=2.0-r118
 activemq_version=3.2.4-SNAPSHOT
-geronimo_version=1.1-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 openejb_version=2.1-SNAPSHOT
-tranql_version=1.2.3
-tranql_connector_version=1.1
+tranql_version=1.3-SNAPSHOT
+tranql_connector_version=1.2-SNAPSHOT
 tranql_vendors_version=1.1
 release_notes_version=1.0
 
-geronimo_packaging_plugin_version=1.1.0-9
-geronimo_assembly_plugin_version=1.1.0-12
-geronimo_deployment_plugin_version=1.1.0-3
-geronimo_dependency_plugin_version=1.1.0-3
+geronimo_packaging_plugin_version=1.1.0-10
+geronimo_assembly_plugin_version=1.1.0-13
+geronimo_deployment_plugin_version=1.1.0-4
+geronimo_dependency_plugin_version=1.1.0-4
 
 geronimo_spec_activation_version=1.0
 

Modified: geronimo/trunk/modules/system/src/test-data/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/system/src/test-data/geronimo-plugins.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/test-data/geronimo-plugins.xml (original)
+++ geronimo/trunk/modules/system/src/test-data/geronimo-plugins.xml Wed May 24 05:12:14 2006
@@ -2,15 +2,15 @@
 <geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
 <plugin>
 <name>DayTrader Performance Testing App (Jetty/Derby)</name>
-<module-id>geronimo/daytrader-derby-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/daytrader-derby-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOT</geronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/geronimo-daytrader-derby-db/1.1-SNAPSHOT/jar</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/geronimo-daytrader-derby-db/1.2-SNAPSHOT/jar</dependency>
 </plugin>
 
 <plugin>
@@ -18,164 +18,164 @@
 <module-id>geronimo/daytrader-derby-jetty-streamer-client/1.1-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/client/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/client/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Jakarta JSP Examples (Jetty)</name>
-<module-id>geronimo/jsp-examples-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/jsp-examples-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
 <dependency>commons-collections/commons-collections/3.1/jar</dependency>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>LDAP Demo Web App (Jetty)</name>
-<module-id>geronimo/ldap-demo-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/ldap-demo-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/ldap-realm/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/ldap-realm/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>LDAP Demo Security Realm</name>
-<module-id>geronimo/ldap-realm/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/ldap-realm/1.2-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <jvm-version>1.5</jvm-version>
-<dependency>geronimo/j2ee-security/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Jakarta Servlet Examples (Jetty)</name>
-<module-id>geronimo/servlets-examples-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/servlets-examples-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Examples</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>jUDDI Server 0.9rc4 for Geronimo</name>
-<module-id>geronimo/uddi-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/uddi-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Integration</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/system-database/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/system-database/1.2-SNAPSHOT/car</dependency>
 <dependency>juddi/juddi/0.9rc4/jar</dependency>
-<dependency>geronimo/geronimo-uddi-db/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/geronimo-uddi-db/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Geronimo Admin Console (Jetty)</name>
-<module-id>geronimo/webconsole-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/webconsole-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Core Geronimo</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/j2ee-security/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-security/1.2-SNAPSHOT/car</dependency>
 <dependency>portlet-api/portlet-api/1.0/jar</dependency>
 <dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
-<dependency>geronimo/geronimo-console-core/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-management/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-test-ddbean/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-deploy-jsr88/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-deploy-config/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-service-builder/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-connector-builder/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-naming-builder/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-security-builder/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-j2ee-schema/1.1-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-console-core/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-management/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-test-ddbean/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-deploy-jsr88/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-deploy-config/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-service-builder/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-connector-builder/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-naming-builder/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-security-builder/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-j2ee-schema/1.2-SNAPSHOT/jar</dependency>
 <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
 <dependency>stax/stax-api/1.0/jar</dependency>
 <dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
 <dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
 <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-converter/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-util/1.1-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-jetty/1.1-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-converter/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-util/1.2-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-jetty/1.2-SNAPSHOT/jar</dependency>
 </plugin>
 
 <plugin>
 <name>Geronimo Remote Deployment Support (Jetty)</name>
-<module-id>geronimo/remote-deploy-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/remote-deploy-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Core Geronimo</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/geronimo-remote-deploy-lib/1.1-SNAPSHOT/jar</dependency>
+<dependency>geronimo/geronimo-remote-deploy-lib/1.2-SNAPSHOT/jar</dependency>
 <dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Geronimo JMX Debug Tool (Jetty)</name>
-<module-id>geronimo/jmxdebug-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/jmxdebug-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Core Geronimo</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
 <dependency>commons-collections/commons-collections/3.1/jar</dependency>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Geronimo Welcome App (Jetty)</name>
-<module-id>geronimo/welcome-jetty/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/welcome-jetty/1.2-SNAPSHOT/car</module-id>
 <category>Core Geronimo</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
 <prerequisite><id>geronimo/jetty/*/car</id><description>
 		This is a web application or web-related module, configured for the Jetty web container.
 It will not run on Tomcat versions of Geronimo.  If you need a Tomcat version of this application,
you'll need to get it from another Tomcat Geronimo installation.
 </description></prerequisite>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/jetty/1.1-SNAPSHOT/car</dependency>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/jetty/1.2-SNAPSHOT/car</dependency>
 </plugin>
 
 <plugin>
 <name>Apache Directory 0.92 for Geronimo</name>
-<module-id>geronimo/directory/1.1-SNAPSHOT/car</module-id>
+<module-id>geronimo/directory/1.2-SNAPSHOT/car</module-id>
 <category>Security</category>
 <description>Test Data</description>
-<geronimo-version>1.1-SNAPSHOT</geronimo-version>
-<dependency>geronimo/j2ee-server/1.1-SNAPSHOT/car</dependency>
-<dependency>geronimo/geronimo-directory/1.1-SNAPSHOT/jar</dependency>
+<geronimo-version>1.2-SNAPSHOTgeronimo-version>
+<dependency>geronimo/j2ee-server/1.2-SNAPSHOT/car</dependency>
+<dependency>geronimo/geronimo-directory/1.2-SNAPSHOT/jar</dependency>
 </plugin>
 
 <default-repository>http://nowhere.com/</default-repository>
 
-</geronimo-plugin-list>
\ No newline at end of file
+</geronimo-plugin-list>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties Wed May 24 05:12:14
2006
@@ -22,8 +22,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1-SNAPSHOT
-geronimo_version=1.1-SNAPSHOT
+geronimoVersion=1.2-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 maven.multiproject.type=plugin
 
 # set eclipse project name (used in eclipse plugin V1.11 onwards)

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Wed May 24 05:12:14 2006
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.1.0-12</currentVersion>
+    <currentVersion>1.1.0-13</currentVersion>
 
     <dependencies>
         <dependency>
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.properties Wed May 24 05:12:14
2006
@@ -22,8 +22,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1-SNAPSHOT
-geronimo_version=1.1-SNAPSHOT
+geronimoVersion=1.2-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 
 maven.multiproject.type=plugin
 

Modified: geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-dependency-plugin/project.xml Wed May 24 05:12:14 2006
@@ -23,7 +23,7 @@
     <id>geronimo-dependency-plugin</id>
     <name>Geronimo :: Maven Dependency Plugin</name>
     <description>A plugin used to construct a geronimo-service.xml dependency list
for a Geronimo module</description>
-    <currentVersion>1.1.0-3</currentVersion>
+    <currentVersion>1.1.0-4</currentVersion>
 
     <dependencies>
         <dependency>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties Wed May 24 05:12:14
2006
@@ -21,5 +21,5 @@
 
 geronimoGroupId=geronimo
 geronimoArtifactId=geronimo
-geronimoVersion=1.1-SNAPSHOT
+geronimoVersion=1.2-SNAPSHOT
 geronimo.deploy.var.source=src/var

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.properties Wed May 24 05:12:14
2006
@@ -29,7 +29,7 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.1-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 
 # set eclipse project name (used in eclipse plugin V1.11 onwards)
 maven.eclipse.project.name=${geronimo.maven.eclipse.plugins.project.prefix}${pom.artifactId}

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/project.xml Wed May 24 05:12:14 2006
@@ -32,7 +32,7 @@
     <package>org.apache.geronimo</package>
     <logo></logo>
 
-    <currentVersion>1.1.0-3</currentVersion>
+    <currentVersion>1.1.0-4</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/project.properties Wed May 24 05:12:14 2006
@@ -23,8 +23,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1-SNAPSHOT
-geronimo_version=1.1-SNAPSHOT
+geronimoVersion=1.2-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 
 maven.multiproject.type=plugin
 

Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-izpack-plugin/project.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/project.xml Wed May 24 05:12:14 2006
@@ -23,18 +23,18 @@
     <id>geronimo-izpack-plugin</id>
     <name>Geronimo :: IZPack Installer Build Plugin</name>
     <description>A plugin used to build an IZPack based installer for Geronimo</description>
-    <currentVersion>1.1-SNAPSHOT</currentVersion>
+    <currentVersion>1.2-SNAPSHOT</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties Wed May 24 05:12:14
2006
@@ -19,7 +19,7 @@
 ## $Rev$ $Date$
 ##
 
-geronimo.packaging.geronimo_version=1.1-SNAPSHOT
+geronimo.packaging.geronimo_version=1.2-SNAPSHOT
 
 geronimo.packaging.srcDir=${basedir}/src/plan
 geronimo.packaging.planFile=plan.xml

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties Wed May 24 05:12:14
2006
@@ -26,7 +26,7 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.1-SNAPSHOT
+geronimo_version=1.2-SNAPSHOT
 
 # set eclipse project name (used in eclipse plugin V1.11 onwards)
 maven.eclipse.project.name=${geronimo.maven.eclipse.plugins.project.prefix}${pom.artifactId}

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Wed May 24 05:12:14 2006
@@ -22,13 +22,13 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.1.0-9</currentVersion>
+    <currentVersion>1.1.0-10</currentVersion>
 
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-common</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
             <properties>
                 <packaging.classpath>true</packaging.classpath>
             </properties>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml Wed May 24
05:12:14 2006
@@ -18,20 +18,20 @@
     <moduleId>
       <groupId>geronimo</groupId>
       <artifactId>system-database</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.2-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>j2ee-server</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2-SNAPSHOT</version>
         <type>car</type>
       </dependency>
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>geronimo-derby</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -124,4 +124,4 @@
       <name>DerbySystem</name>
     </dependency>
   </gbean>
-</connector>
\ No newline at end of file
+</connector>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml Wed May
24 05:12:14 2006
@@ -17,20 +17,20 @@
     <dep:moduleId>
       <dep:groupId>geronimo</dep:groupId>
       <dep:artifactId>system-database</dep:artifactId>
-      <dep:version>1.1-SNAPSHOT</dep:version>
+      <dep:version>1.2-SNAPSHOT</dep:version>
       <dep:type>car</dep:type>
     </dep:moduleId>
     <dep:dependencies>
       <dep:dependency>
         <dep:groupId>geronimo</dep:groupId>
         <dep:artifactId>j2ee-server</dep:artifactId>
-        <dep:version>1.1-SNAPSHOT</dep:version>
+        <dep:version>1.2-SNAPSHOT</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
       <dep:dependency>
         <dep:groupId>geronimo</dep:groupId>
         <dep:artifactId>geronimo-derby</dep:artifactId>
-        <dep:version>1.1-SNAPSHOT</dep:version>
+        <dep:version>1.2-SNAPSHOT</dep:version>
         <dep:type>jar</dep:type>
         <dep:import>classes</dep:import>
       </dep:dependency>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=409146&r1=409145&r2=409146&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed May 24 05:12:14 2006
@@ -24,7 +24,7 @@
   <artifactId>geronimo</artifactId>
   <packaging>pom</packaging>
   <name>Geronimo</name>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <description>Geronimo parent</description>
   <url>http://geronimo.apache.org</url>
 
@@ -103,7 +103,7 @@
      | Geronimo module versions
      |
      -->
-    <geronimoVersion>1.0</geronimoVersion>
+    <geronimoVersion>1.2</geronimoVersion>
     
     <!--
      |



Mime
View raw message