geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r419227 - in /geronimo/branches/1.1: etc/ plugins/geronimo-assembly-plugin/ plugins/geronimo-dependency-plugin/ plugins/geronimo-deployment-plugin/ plugins/geronimo-izpack-plugin/ plugins/geronimo-packaging-plugin/ plugins/geronimo-packagin...
Date Wed, 05 Jul 2006 13:44:16 GMT
Author: hogstrom
Date: Wed Jul  5 06:44:15 2006
New Revision: 419227

URL: http://svn.apache.org/viewvc?rev=419227&view=rev
Log:
Updated 1.1 Branch to be 1.1.1-SNAPSHOT.

Modified:
    geronimo/branches/1.1/etc/explicit_versions.properties
    geronimo/branches/1.1/etc/project.properties
    geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.properties
    geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.properties
    geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.properties
    geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.properties
    geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.properties
    geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.properties
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml

Modified: geronimo/branches/1.1/etc/explicit_versions.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/etc/explicit_versions.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/explicit_versions.properties (original)
+++ geronimo/branches/1.1/etc/explicit_versions.properties Wed Jul  5 06:44:15 2006
@@ -7,7 +7,7 @@
 #
 activeio///=2.0-r118
 activemq///=3.2.4
-geronimo///=1.1
+geronimo///=1.1.1-SNAPSHOT
 openejb///=2.1
 tranql/tranql//jar=1.3
 tranql/connector//rar=1.2

Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/etc/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Wed Jul  5 06:44:15 2006
@@ -26,7 +26,7 @@
 #####################################################
 
 maven.repo.remote=\
-http://people.apache.org/repository,\
+http://repo.mergere.com,\
 http://dist.codehaus.org,\
 http://www.mortbay.org/maven,\
 http://www.ibiblio.org/maven,\
@@ -89,17 +89,17 @@
 #####################################################
 activeio_version=2.0-r118
 activemq_version=3.2.4
-geronimo_version=1.1
-openejb_version=2.1
-tranql_version=1.3
+geronimo_version=1.1.1-SNAPSHOT
+openejb_version=2.1.1-SNAPSHOT
+tranql_version=1.3.1-SNAPSHOT
 tranql_connector_version=1.2
 tranql_vendors_version=1.1
 release_notes_version=1.0
 
-geronimo_packaging_plugin_version=1.1.0-10
-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.1-10
+geronimo_assembly_plugin_version=1.1.1-12
+geronimo_deployment_plugin_version=1.1.1-3
+geronimo_dependency_plugin_version=1.1.1-3
 
 geronimo_spec_activation_version=1.1
 

Modified: geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.properties Wed Jul  5 06:44:15
2006
@@ -22,8 +22,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1
-geronimo_version=1.1
+geronimoVersion=1.1.1-SNAPSHOT
+geronimo_version=1.1.1-SNAPSHOT
 maven.multiproject.type=plugin
 
 # set eclipse project name (used in eclipse plugin V1.11 onwards)

Modified: geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-assembly-plugin/project.xml Wed Jul  5 06:44:15
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.1-12</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.properties Wed Jul  5
06:44:15 2006
@@ -22,8 +22,8 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1
-geronimo_version=1.1
+geronimoVersion=1.1.1-SNAPSHOT
+geronimo_version=1.1.1-SNAPSHOT
 
 maven.multiproject.type=plugin
 

Modified: geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-dependency-plugin/project.xml Wed Jul  5 06:44:15
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.1-3</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.properties Wed Jul  5
06:44:15 2006
@@ -21,5 +21,5 @@
 
 geronimoGroupId=geronimo
 geronimoArtifactId=geronimo
-geronimo_version=1.1
+geronimo_version=1.1.1-SNAPSHOT
 geronimo.deploy.var.source=src/var

Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.properties Wed Jul  5
06:44:15 2006
@@ -29,7 +29,7 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.1
+geronimo_version=1.1.1-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/branches/1.1/plugins/geronimo-deployment-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/project.xml Wed Jul  5 06:44:15
2006
@@ -32,7 +32,7 @@
     <package>org.apache.geronimo</package>
     <logo></logo>
 
-    <currentVersion>1.1.0-3</currentVersion>
+    <currentVersion>1.1.1-3</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.properties Wed Jul  5 06:44:15
2006
@@ -23,7 +23,7 @@
 maven.compile.source=1.4
 maven.compile.target=1.4
 
-geronimoVersion=1.1
+geronimoVersion=1.1.1-SNAPSHOT
 geronimo_version=1.1
 
 maven.multiproject.type=plugin

Modified: geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-izpack-plugin/project.xml Wed Jul  5 06:44:15 2006
@@ -23,7 +23,7 @@
     <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</currentVersion>
+    <currentVersion>1.1.1</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties Wed Jul  5 06:44:15
2006
@@ -19,7 +19,7 @@
 ## $Rev$ $Date$
 ##
 
-geronimo.packaging.geronimo_version=1.1
+geronimo.packaging.geronimo_version=1.1.1-SNAPSHOT
 
 geronimo.packaging.srcDir=${basedir}/src/plan
 geronimo.packaging.planFile=plan.xml

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.properties?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.properties Wed Jul  5
06:44:15 2006
@@ -26,7 +26,7 @@
 
 maven.multiproject.type=plugin
 
-geronimo_version=1.1
+geronimo_version=1.1.1-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/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml Wed Jul  5 06:44:15
2006
@@ -22,7 +22,7 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.1.0-10</currentVersion>
+    <currentVersion>1.1.1-10</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml Wed
Jul  5 06:44:15 2006
@@ -18,20 +18,20 @@
     <moduleId>
       <groupId>geronimo</groupId>
       <artifactId>system-database</artifactId>
-      <version>1.1</version>
+      <version>1.1.1-SNAPSHOT</version>
       <type>car</type>
     </moduleId>
     <dependencies>
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>j2ee-server</artifactId>
-        <version>1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
         <type>car</type>
       </dependency>
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>geronimo-derby</artifactId>
-        <version>1.1</version>
+        <version>1.1.1-SNAPSHOT</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml?rev=419227&r1=419226&r2=419227&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
(original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
Wed Jul  5 06:44:15 2006
@@ -17,20 +17,20 @@
     <dep:moduleId>
       <dep:groupId>geronimo</dep:groupId>
       <dep:artifactId>system-database</dep:artifactId>
-      <dep:version>1.1</dep:version>
+      <dep:version>1.1.1-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</dep:version>
+        <dep:version>1.1.1-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</dep:version>
+        <dep:version>1.1.1-SNAPSHOT</dep:version>
         <dep:type>jar</dep:type>
         <dep:import>classes</dep:import>
       </dep:dependency>



Mime
View raw message