geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r677415 - in /geronimo/samples/trunk: pom.xml samples/app-per-port/app-per-port-ear/pom.xml samples/app-per-port/app-per-port-tomcat/pom.xml samples/pom.xml
Date Wed, 16 Jul 2008 20:32:23 GMT
Author: jbohn
Date: Wed Jul 16 13:32:23 2008
New Revision: 677415

URL: http://svn.apache.org/viewvc?rev=677415&view=rev
Log:
use variables for some version references and move geronimoVersion up to top level

Modified:
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-ear/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
    geronimo/samples/trunk/samples/pom.xml

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=677415&r1=677414&r2=677415&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Wed Jul 16 13:32:23 2008
@@ -46,7 +46,7 @@
     </scm>
 
     <properties>
-        <!--<version>2.2-SNAPSHOT</version>-->
+        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
         <siteId>geronimo-samples</siteId>
         <projectName>Apache Geronimo Samples</projectName>
     </properties>

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-ear/pom.xml?rev=677415&r1=677414&r2=677415&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-ear/pom.xml Wed Jul 16 13:32:23
2008
@@ -40,20 +40,20 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>app-per-port-war1</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>app-per-port-war2</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>app-per-port-connector-war</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
     </dependencies>

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml?rev=677415&r1=677414&r2=677415&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml Wed Jul 16 13:32:23
2008
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>app-per-port-ear</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
             <scope>provided</scope>
         </dependency>
@@ -88,8 +88,6 @@
     </dependencies>
 
     <properties>
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
-
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
@@ -101,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
@@ -113,7 +111,7 @@
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>app-per-port-ear</artifactId>
-                        <version>2.2-SNAPSHOT</version>
+                        <version>${version}</version>
                         <type>ear</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=677415&r1=677414&r2=677415&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Wed Jul 16 13:32:23 2008
@@ -32,9 +32,6 @@
     </description>
 
     <properties>
-        <!--<geronimoVersion>2.1</geronimoVersion>-->
-        <geronimoVersion>2.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>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>



Mime
View raw message