geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r942493 [3/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/activemq/activemq-webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -24,7 +24,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>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -40,14 +40,14 @@
         <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>
         <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>
@@ -58,28 +58,28 @@
         <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.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-webconsole</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml Sun May  9 06:36:39 2010
@@ -35,7 +35,7 @@
             <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>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -51,14 +51,14 @@
         <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>
         <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>
@@ -69,28 +69,28 @@
         <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.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-webconsole</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Sun May  9 06:36:39 2010
@@ -37,14 +37,14 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-management</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- g-j2ee comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

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

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Sun May  9 06:36:39 2010
@@ -38,27 +38,27 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-aries-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
 <!--
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-aries-shell</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-aries-resolver</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

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

Modified: geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml Sun May  9 06:36:39 2010
@@ -37,7 +37,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>
@@ -55,14 +55,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.modules</groupId>
             <artifactId>geronimo-aspectj</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

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

Modified: geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml Sun May  9 06:36:39 2010
@@ -40,21 +40,21 @@
         <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>openejb-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>runtime</scope>
         </dependency>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis-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,31 +81,31 @@
     <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>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>
     <dependency>
       <groupId>org.apache.geronimo.configs</groupId>
       <artifactId>axis</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.configs</groupId>
       <artifactId>axis-deployer</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>car</type>
     </dependency>
   </dependencies>

Modified: geronimo/server/trunk/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/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>
@@ -48,28 +48,28 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webservices-common</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>openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
 <!-- openejb-axis may be needed, but does not seem to be ready yet -->
@@ -105,7 +105,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
-                            <version>${version}</version>
+                            <version>${project.version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml Sun May  9 06:36:39 2010
@@ -38,19 +38,19 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-openejb-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-axis</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <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/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Sun May  9 06:36:39 2010
@@ -37,32 +37,32 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</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>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webservices-common</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 

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

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

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Sun May  9 06:36:39 2010
@@ -40,28 +40,28 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-ejb-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2-ejb-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-ejb</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,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>
@@ -50,20 +50,20 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,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>
@@ -49,20 +49,20 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>server-security-config</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -70,13 +70,13 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webservices-common</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml Sun May  9 06:36:39 2010
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -45,31 +45,31 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-jaxws-builder</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
         
         <!-- xbean-finder, g-service-builder comes transitively from this -->
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
         
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-naming-builder</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
 
        <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.modules</groupId>-->
             <!--<artifactId>geronimo-axis2</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
 
     </dependencies>

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

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

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Sun May  9 06:36:39 2010
@@ -37,20 +37,20 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webservices-common</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-ca-helper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>test</scope>
         </dependency>
@@ -50,7 +50,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>
@@ -58,7 +58,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>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -86,7 +86,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-ca-helper</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <category>Security</category>

Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>geronimo-ca-helper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>test</scope>
         </dependency>
@@ -50,7 +50,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>
@@ -58,7 +58,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>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -86,7 +86,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-ca-helper</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <category>Security</category>

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

Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Sun May  9 06:36:39 2010
@@ -38,27 +38,27 @@
         <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>client</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-transaction-1_6</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -79,7 +79,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-client-builder</artifactId>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <includes>**/*.xsd</includes>

Modified: geronimo/server/trunk/plugins/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -61,8 +61,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false" />
-                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${project.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${project.version}/car">org.apache.geronimo.configs/client-security/${project.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Sun May  9 06:36:39 2010
@@ -37,7 +37,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>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>client-system</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -54,43 +54,43 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-core</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <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-naming</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-crypto</artifactId>-->
-            <!--<version>${version}</version>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</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-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.configs</groupId>
@@ -140,8 +140,8 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false" />
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${version}/car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${project.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${project.version}/car">org.apache.geronimo.configs/client/${project.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Sun May  9 06:36:39 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries</groupId>
         <artifactId>org.apache.aries.util</artifactId>
         <type>jar</type>
@@ -22,6 +27,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>
@@ -53,6 +63,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-core</artifactId>
         <type>jar</type>
     </dependency>
@@ -63,6 +78,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-main</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
@@ -173,6 +193,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-saaj_1.3_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -228,6 +253,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         <type>jar</type>
     </dependency>
@@ -237,6 +267,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-asm-shaded</artifactId>
         <type>jar</type>

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

Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Sun May  9 06:36:39 2010
@@ -37,20 +37,20 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- g-system comes from this -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</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>
     </dependencies>
     

Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Sun May  9 06:36:39 2010
@@ -59,7 +59,7 @@
                             <source-repository>${pluginSrcRepoCentral}</source-repository>
                             <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
 
-                            <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="${project.groupId}/${project.artifactId}//car">${project.groupId}/${project.artifactId}/${project.version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>

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

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.it</groupId>
             <artifactId>sample-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <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>
@@ -64,7 +64,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>
@@ -72,7 +72,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>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>persistence-jpa20-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -96,28 +96,28 @@
         <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.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>openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -146,7 +146,7 @@
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
                         <artifactId>customer-ear</artifactId>
-                        <version>${version}</version>
+                        <version>${project.version}</version>
                         <type>ear</type>
                     </module>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/plugin-farm-it/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,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>
@@ -49,19 +49,19 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>plugin-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.it</groupId>
             <artifactId>clustering-test</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins.it</groupId>
             <artifactId>customer-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -74,14 +74,14 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${project.version}</version>
                     <configuration>
                         <assemblies>
                             <assembly>
                                 <id>node</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-plugin-farm-node</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -89,7 +89,7 @@
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-jetty8-javaee6</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -98,7 +98,7 @@
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-jetty8-minimal</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -107,7 +107,7 @@
                                 <id>tomcat</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-tomcat6-javaee5</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -116,7 +116,7 @@
                                 <id>tomcat-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-tomcat6-minimal</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -125,7 +125,7 @@
                                 <id>framework</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
                                 <artifactId>geronimo-framework</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
                             </assembly>
@@ -240,7 +240,7 @@
                             <!--</goals>-->
                             <!--<configuration>-->
                                 <!--<defaultGeronimoRepository>~/.m2/repository</defaultGeronimoRepository>-->
-                                <!--<moduleId>org.apache.geronimo.configs/plugin-farm-member/${version}/car</moduleId>-->
+                                <!--<moduleId>org.apache.geronimo.configs/plugin-farm-member/${project.version}/car</moduleId>-->
                                 <!--<port>1119</port>-->
                             <!--</configuration>-->
                         <!--</execution>-->
@@ -251,7 +251,7 @@
                                 <goal>install-plugin</goal>
                             </goals>
                             <!--<configuration>-->
-                            <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${version}/</defaultGeronimoRepository>-->
+                            <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${project.version}/</defaultGeronimoRepository>-->
                             <!--</configuration>-->
                         </execution>
                         <execution>

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/sample-datasource/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,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>
@@ -59,28 +59,28 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
             <!-- why is deployment needed for clustering??? -->
             <!--<scope>provided</scope>-->
@@ -50,28 +50,28 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</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.framework</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-clustering</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Sun May  9 06:36:39 2010
@@ -41,35 +41,35 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</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>
 
         <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>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

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

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml Sun May  9 06:36:39 2010
@@ -37,25 +37,25 @@
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-deploy-jsr88</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-jmx-remoting</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     

Modified: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/pom.xml Sun May  9 06:36:39 2010
@@ -37,36 +37,36 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</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-jmx-remoting</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <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/clustering/geronimo-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml Sun May  9 06:36:39 2010
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm-node/pom.xml Sun May  9 06:36:39 2010
@@ -74,13 +74,13 @@
         <dependency>
             <groupId>org.apache.geronimo.framework.plugingroups</groupId>
             <artifactId>framework</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>plugin-farm-member</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml Sun May  9 06:36:39 2010
@@ -37,32 +37,32 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa2</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa20</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-jmx-remoting</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-datasource/pom.xml Sun May  9 06:36:39 2010
@@ -36,7 +36,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>
@@ -46,14 +46,14 @@
         <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>
         <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/clustering/plugin-farm-member/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml Sun May  9 06:36:39 2010
@@ -41,7 +41,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>
@@ -49,21 +49,21 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jmx-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/pom.xml Sun May  9 06:36:39 2010
@@ -41,28 +41,28 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</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>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>plugin-farm-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-plugin-farm</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

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



Mime
View raw message