geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r885058 - 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/ plugins/ plug...
Date Sat, 28 Nov 2009 01:24:32 GMT
Author: djencks
Date: Sat Nov 28 01:24:31 2009
New Revision: 885058

URL: http://svn.apache.org/viewvc?rev=885058&view=rev
Log:
GERONIMO-4655 hopefully the last pom fixes so all snapshots are updated by release plugin

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/plugins/monitoring/pom.xml
    geronimo/server/branches/2.2/plugins/pom.xml
    geronimo/server/branches/2.2/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=885058&r1=885057&r2=885058&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
Sat Nov 28 01:24:31 2009
@@ -23,8 +23,8 @@
     <packaging>application-assembly</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <!-- This may be helpful in selecting the desired geronimo version -->
+        <geronimoVersion>2.2</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=885058&r1=885057&r2=885058&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
Sat Nov 28 01:24:31 2009
@@ -7,8 +7,8 @@
     <packaging>server-assembly</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <!-- This may be helpful in selecting the desired geronimo version -->
+        <geronimoVersion>2.2</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=885058&r1=885057&r2=885058&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
Sat Nov 28 01:24:31 2009
@@ -23,8 +23,8 @@
     <packaging>car</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <!-- This may be helpful in selecting the desired geronimo version -->
+        <geronimoVersion>2.2</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=885058&r1=885057&r2=885058&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
Sat Nov 28 01:24:31 2009
@@ -23,8 +23,8 @@
     <packaging>car</packaging>
 
     <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <!-- This may be helpful in selecting the desired geronimo version -->
+        <geronimoVersion>2.2</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/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/pom.xml?rev=885058&r1=885057&r2=885058&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/pom.xml Sat Nov 28 01:24:31 2009
@@ -73,7 +73,7 @@
             </modules>
         </profile>
         <profile>
-            <id>all-submodules</id>
+            <id>all-subprojects</id>
             <modules>
                 <module>mconsole-jetty-server</module>
                 <module>mconsole-jetty-server/mconsole-itest-simple</module>

Modified: geronimo/server/branches/2.2/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/pom.xml?rev=885058&r1=885057&r2=885058&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/pom.xml Sat Nov 28 01:24:31 2009
@@ -162,5 +162,11 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            <modules>
+                <module>jetty</module>
+            </modules>
+        </profile>
     </profiles> 
 </project>

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=885058&r1=885057&r2=885058&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Sat Nov 28 01:24:31 2009
@@ -53,16 +53,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <!--        <version>2.2-SNAPSHOT</version>-->
-
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
 



Mime
View raw message