geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r942493 [7/9] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty8-javaee6/ assemblies/geronimo-jetty8-minimal/ assemblies/geronimo-tomcat7-javaee6/ assemblies/geronimo-tomcat7-minimal/ framework/assemblies/geronimo-framework/ framewo...
Date Sun, 09 May 2010 06:36:48 GMT
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml Sun May  9 06:36:39 2010
@@ -38,32 +38,32 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-wab</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- g-security comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml Sun May  9 06:36:39 2010
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-clustering-wadi</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -68,7 +68,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat7-clustering-wadi</artifactId>
-                            <version>${version}</version>
+                            <version>${project.version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml Sun May  9 06:36:39 2010
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-no-ha</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>wadi-clustering</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>runtime</scope>
         </dependency>
@@ -63,13 +63,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat7-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-web-2.5-builder</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
     </dependencies>
 
@@ -90,12 +90,12 @@
                                <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-web-2.5-builder</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-tomcat7-builder</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <includes>**/*.xsd</includes>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -47,14 +47,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -47,28 +47,28 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>server-security-config</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Required because tomcat STARTS its default web.xml which has a jasper servlet in it -->
@@ -76,7 +76,7 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Sun May  9 06:36:39 2010
@@ -46,7 +46,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>system-database</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Sun May  9 06:36:39 2010
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>system-database</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml Sun May  9 06:36:39 2010
@@ -35,7 +35,7 @@
         <plugin>
           <groupId>org.apache.geronimo.buildsupport</groupId>
           <artifactId>car-maven-plugin</artifactId>
-          <version>${version}</version>
+          <version>${project.version}</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
@@ -81,13 +81,13 @@
     <dependency>
       <groupId>org.apache.geronimo.framework</groupId>
       <artifactId>karaf-framework</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.configs</groupId>
       <artifactId>uddi-jetty</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
   </dependencies>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -62,14 +62,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>uddi-db</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         
@@ -88,13 +88,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty8</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Sun May  9 06:36:39 2010
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -45,14 +45,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>uddi-db</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -81,13 +81,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/geronimo-web-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/pom.xml Sun May  9 06:36:39 2010
@@ -41,14 +41,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-wab</artifactId>
-            <version>${version}</version>
+            <artifactId>geronimo-web</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/wab/web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-extender</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Sun May  9 06:36:39 2010
@@ -63,11 +63,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-wab</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-web</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml Sun May  9 06:36:39 2010
@@ -34,7 +34,7 @@
         <plugin>
           <groupId>org.apache.geronimo.buildsupport</groupId>
           <artifactId>car-maven-plugin</artifactId>
-          <version>${version}</version>
+          <version>${project.version}</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
@@ -81,84 +81,84 @@
     <dependency>
       <groupId>org.apache.geronimo.framework</groupId>
       <artifactId>karaf-framework</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>web-extender</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency> 
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>aries-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -166,21 +166,21 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty8</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty8-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
   </dependencies>

Modified: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml Sun May  9 06:36:39 2010
@@ -34,7 +34,7 @@
         <plugin>
           <groupId>org.apache.geronimo.buildsupport</groupId>
           <artifactId>car-maven-plugin</artifactId>
-          <version>${version}</version>
+          <version>${project.version}</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
@@ -81,77 +81,77 @@
     <dependency>
       <groupId>org.apache.geronimo.framework</groupId>
       <artifactId>karaf-framework</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>myfaces-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>web-extender</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -159,21 +159,21 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
   </dependencies>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml Sun May  9 06:36:39 2010
@@ -37,14 +37,14 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-webservices</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- g-kernel, g-common, g-j2ee g-j2ee-schema coming from this -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Sun May  9 06:36:39 2010
@@ -37,31 +37,31 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-interceptor</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-core</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -47,14 +47,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -73,7 +73,7 @@
          <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 <!--
         <dependency>

Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml Sun May  9 06:36:39 2010
@@ -33,7 +33,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
                     <extensions>true</extensions>
                 </plugin>
             </plugins>
@@ -85,13 +85,13 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>karaf-framework</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-welcome</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -68,21 +68,21 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -102,7 +102,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-welcome</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml Sun May  9 06:36:39 2010
@@ -33,7 +33,7 @@
         <plugin>
           <groupId>org.apache.geronimo.buildsupport</groupId>
           <artifactId>car-maven-plugin</artifactId>
-          <version>${version}</version>
+          <version>${project.version}</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
@@ -79,92 +79,92 @@
     <dependency>
       <groupId>org.apache.geronimo.framework</groupId>
       <artifactId>karaf-framework</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
       <dependency>
           <groupId>org.apache.geronimo.configs</groupId>
           <artifactId>welcome-tomcat</artifactId>
-          <version>${version}</version>
+          <version>${project.version}</version>
           <type>car</type>
       </dependency>
       <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <!--dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency-->
         <!--dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <!--dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <!--dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency-->
 
         <!--dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>gshell-geronimo</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>gshell-remote</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
        <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>plugin-console-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
   </dependencies>

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml Sun May  9 06:36:39 2010
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-welcome</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -68,21 +68,21 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -109,7 +109,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-welcome</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun May  9 06:36:39 2010
@@ -2304,6 +2304,7 @@ only found in cxf
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-property-plugin</artifactId>
+                    <version>${project.version}</version>
                     <executions>
                         <execution>
                             <id>set-property</id>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/pom.xml Sun May  9 06:36:39 2010
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-commands</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies> 
 
@@ -60,7 +60,7 @@
                                 <systemProperties>
                                     <property>
                                         <name>geronimoVersion</name>
-                                        <value>${version}</value>
+                                        <value>${project.version}</value>
                                     </property>
                                 </systemProperties>
                             </configuration>

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Sun May  9 06:36:39 2010
@@ -54,7 +54,7 @@
                                 <systemProperties>
                                     <property>
                                         <name>geronimoVersion</name>
-                                        <value>${version}</value>
+                                        <value>${project.version}</value>
                                     </property>
                                 </systemProperties>
                             </configuration>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Sun May  9 06:36:39 2010
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Sun May  9 06:36:39 2010
@@ -48,21 +48,21 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-client</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -81,17 +81,17 @@
                             <groupId>${pom.groupId}</groupId>
                             <artifactId>corba-helloworld-war</artifactId>
                             <contextRoot>/corba-helloworld</contextRoot>
-                            <bundleFileName>corba-helloworld-war-${version}.war</bundleFileName>
+                            <bundleFileName>corba-helloworld-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>${pom.groupId}</groupId>
                             <artifactId>corba-helloworld-ejb</artifactId>
-                            <bundleFileName>corba-helloworld-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>corba-helloworld-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                         <jarModule>
                             <groupId>${pom.groupId}</groupId>
                             <artifactId>corba-helloworld-client</artifactId>
-                            <bundleFileName>corba-helloworld-client-${version}.jar</bundleFileName>
+                            <bundleFileName>corba-helloworld-client-${project.version}.jar</bundleFileName>
                         </jarModule>
                     </modules>
                 </configuration>
@@ -149,7 +149,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                             <execution>
@@ -159,7 +159,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
 
@@ -173,7 +173,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
 
@@ -187,7 +187,7 @@
                                     <goal>run-client</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${project.version}/car</moduleId>
                                     <logOutput>true</logOutput>
                                     <logFile>${clientLogFile}</logFile>
                                 </configuration>
@@ -203,7 +203,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-helloworld-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Sun May  9 06:36:39 2010
@@ -48,14 +48,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-client</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -73,12 +73,12 @@
                         <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>corba-marshal-ejb</artifactId>
-                            <bundleFileName>corba-marshal-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>corba-marshal-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                         <jarModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>corba-marshal-client</artifactId>
-                            <bundleFileName>corba-marshal-client-${version}.jar</bundleFileName>
+                            <bundleFileName>corba-marshal-client-${project.version}.jar</bundleFileName>
                         </jarModule>
                     </modules>
                 </configuration>
@@ -105,7 +105,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                             <execution>
@@ -115,7 +115,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
 
@@ -127,7 +127,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
 
@@ -139,7 +139,7 @@
                                     <goal>run-client</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.testsuite/corba-marshal-client/${project.version}/car</moduleId>
                                     <!--
                                     <logOutput>true</logOutput>
                                     <logFile>${clientLogFile}</logFile>
@@ -155,7 +155,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Sun May  9 06:36:39 2010
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
@@ -81,12 +81,12 @@
                             <groupId>${pom.groupId}</groupId>
                             <artifactId>corba-mytime-war</artifactId>
                             <contextRoot>/corba-mytime</contextRoot>
-                            <bundleFileName>corba-mytime-war-${version}.war</bundleFileName>
+                            <bundleFileName>corba-mytime-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>${pom.groupId}</groupId>
                             <artifactId>corba-mytime-ejb</artifactId>
-                            <bundleFileName>corba-mytime-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>corba-mytime-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                 </configuration>
@@ -158,7 +158,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car</moduleId>
+                                    <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                             <execution>
@@ -168,7 +168,7 @@
                                     <goal>start-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car
+                                    <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car
                                     </moduleId>
                                 </configuration>
                             </execution>
@@ -181,7 +181,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear
                                     </moduleArchive>
                                 </configuration>
                             </execution>
@@ -194,7 +194,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml Sun May  9 06:36:39 2010
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml Sun May  9 06:36:39 2010
@@ -78,7 +78,7 @@
                                         <module>
                                             <groupId>org.apache.geronimo.testsupport</groupId>
                                             <artifactId>test-ear-j2ee_1.3</artifactId>
-                                            <version>${version}</version>
+                                            <version>${project.version}</version>
                                             <type>ear</type>
                                         </module>
                                         -->
@@ -86,7 +86,7 @@
                                         <module>
                                             <groupId>org.apache.geronimo.testsupport</groupId>
                                             <artifactId>test-ear-j2ee_1.4</artifactId>
-                                            <version>${version}</version>
+                                            <version>${project.version}</version>
                                             <type>ear</type>
                                         </module>
                                     </modules>
@@ -106,7 +106,7 @@
                                            <module>
                                                <groupId>org.apache.geronimo.testsupport</groupId>
                                                <artifactId>test-ear-j2ee_1.3</artifactId>
-                                               <version>${version}</version>
+                                               <version>${project.version}</version>
                                                <type>ear</type>
                                            </module>
                                        </modules>
@@ -121,7 +121,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
+                                    <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Sun May  9 06:36:39 2010
@@ -43,7 +43,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>system-database</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jca-cms-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -153,7 +153,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -163,7 +163,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Sun May  9 06:36:39 2010
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Sun May  9 06:36:39 2010
@@ -31,26 +31,26 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -98,7 +98,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -108,7 +108,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Sun May  9 06:36:39 2010
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar2</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml Sun May  9 06:36:39 2010
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-jar2</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>manifestcp-war-jar</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-client/pom.xml Sun May  9 06:36:39 2010
@@ -73,7 +73,7 @@
                                 </property>
                                 <property>
                                     <name>appName</name>
-                                    <value>${artifactId}-${version}</value>
+                                    <value>${project.artifactId}-${project.version}</value>
                                 </property>
                             </systemProperties>
                         </configuration>
@@ -90,7 +90,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/appname-tests/appname-ear/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>appname-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -111,7 +111,7 @@
                                 </property>
                                 <property>
                                     <name>appName</name>
-                                    <value>${artifactId}-${version}</value>
+                                    <value>${project.artifactId}-${project.version}</value>
                                 </property>
                             </systemProperties>
                         </configuration>
@@ -128,7 +128,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
 
@@ -139,7 +139,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>



Mime
View raw message