geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r756973 - in /geronimo/server/branches/2.1.4: framework/configs/ framework/configs/plugin/ plugins/ plugins/axis/axis-deployer/ plugins/axis2/axis2-deployer/ plugins/axis2/axis2-ejb-deployer/ plugins/client/client-deployer/ plugins/connecto...
Date Sat, 21 Mar 2009 17:13:02 GMT
Author: djencks
Date: Sat Mar 21 17:12:50 2009
New Revision: 756973

URL: http://svn.apache.org/viewvc?rev=756973&view=rev
Log:
GERONIMO-4598 tie down versions in geronimo-plugin.xml

Modified:
    geronimo/server/branches/2.1.4/framework/configs/plugin/pom.xml
    geronimo/server/branches/2.1.4/framework/configs/pom.xml
    geronimo/server/branches/2.1.4/plugins/axis/axis-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/axis2/axis2-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/axis2/axis2-ejb-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/client/client-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/connector/connector-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/corba/openejb-corba-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/jasper/jasper-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/jaxws/jaxws-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/jetty/jetty6-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/jetty/jetty6/pom.xml
    geronimo/server/branches/2.1.4/plugins/myfaces/myfaces-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/openejb/openejb-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/openjpa/persistence-jpa10-deployer/pom.xml
    geronimo/server/branches/2.1.4/plugins/pom.xml
    geronimo/server/branches/2.1.4/plugins/tomcat/tomcat6-deployer/pom.xml

Modified: geronimo/server/branches/2.1.4/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/framework/configs/plugin/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/branches/2.1.4/framework/configs/plugin/pom.xml Sat Mar 21 17:12:50 2009
@@ -123,7 +123,8 @@
                             <config-xml-content>
                                 <gbean name="DownloadedPluginRepos">
                                     <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-2.1.4.txt</attribute>
-                                    <attribute name="userRepositories">~/.m2/repository</attribute>
+                                    <!--<attribute name="userRepositories">~/.m2/repository</attribute>-->
+                                    <attribute name="userRepositories">http://geronimo.apache.org/plugins/geronimo-2.1.4</attribute>
                                 </gbean>
                             </config-xml-content>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.1.4/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/framework/configs/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/framework/configs/pom.xml (original)
+++ geronimo/server/branches/2.1.4/framework/configs/pom.xml Sat Mar 21 17:12:50 2009
@@ -70,12 +70,10 @@
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
                     <osiApproved>true</osiApproved>
-                    <!--
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    -->
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
@@ -85,7 +83,7 @@
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
                             <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+                            <!--<source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>-->
                             <artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias key="${groupId}/${artifactId}/2.1.3/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias key="${groupId}/${artifactId}/2.1.2/car">${groupId}/${artifactId}/${version}/car</artifact-alias>

Modified: geronimo/server/branches/2.1.4/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/axis/axis-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/axis/axis-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -86,27 +86,32 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-webservices-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-axis-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/axis2/axis2-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/axis2/axis2-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -72,17 +72,20 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-axis2-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/axis2/axis2-ejb-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -81,23 +81,27 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>axis2-ejb</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-axis2-ejb-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/client/client-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/client/client-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -89,29 +89,34 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-connector-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>client</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-client-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>client-transaction</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/connector/connector-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/connector/connector-deployer/pom.xml Sat Mar 21
17:12:50 2009
@@ -74,18 +74,21 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-connector-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/corba/openejb-corba-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/corba/openejb-corba-deployer/pom.xml Sat Mar 21
17:12:50 2009
@@ -81,22 +81,26 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-corba-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-corba</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/cxf/cxf-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/cxf/cxf-deployer/pom.xml Sat Mar 21 17:12:50 2009
@@ -72,11 +72,13 @@
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>jaxws-deployer</artifactId>
+                            <version>${version}</version>
                         <type>car</type>
                       </dependency>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>cxf</artifactId>
+                            <version>${version}</version>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
@@ -84,6 +86,7 @@
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-cxf-builder</artifactId>
                         <type>jar</type>
+                            <version>${version}</version>
                         <import>classes</import>
                       </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/cxf/cxf-ejb-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -79,23 +79,27 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jaxws-ejb-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-ejb</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-cxf-ejb-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/jasper/jasper-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/jasper/jasper-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -71,18 +71,21 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jasper</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-jasper-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/jaxws/jaxws-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/jaxws/jaxws-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -110,11 +110,13 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>webservices-common</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/jetty/jetty6-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/jetty/jetty6-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -86,27 +86,32 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jetty6</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-web-2.5-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
+                            <version>${version}</version>
                             <artifactId>geronimo-jetty6-builder</artifactId>
                             <type>jar</type>
                             <import>classes</import>

Modified: geronimo/server/branches/2.1.4/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/jetty/jetty6/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/jetty/jetty6/pom.xml Sat Mar 21 17:12:50 2009
@@ -113,46 +113,55 @@
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-server</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>server-security-config</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-jetty6</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty</artifactId>
+                            <version>6.1.7</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-ajp</artifactId>
+                            <version>6.1.7</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-sslengine</artifactId>
+                            <version>6.1.7</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.mortbay.jetty</groupId>
                             <artifactId>jetty-util</artifactId>
+                            <version>6.1.7</version>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>webservices-common</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/myfaces/myfaces-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/myfaces/myfaces-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -71,17 +71,20 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-myfaces-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>myfaces</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/openejb/openejb-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/openejb/openejb-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -100,23 +100,27 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-webservices-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-openejb-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1.4/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/openjpa/persistence-jpa10-deployer/pom.xml Sat
Mar 21 17:12:50 2009
@@ -83,18 +83,21 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>transaction</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-persistence-jpa10-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                     </dependencies>

Modified: geronimo/server/branches/2.1.4/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/pom.xml Sat Mar 21 17:12:50 2009
@@ -94,12 +94,10 @@
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
                     <osiApproved>true</osiApproved>
-                    <!--
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    -->
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>

Modified: geronimo/server/branches/2.1.4/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/tomcat/tomcat6-deployer/pom.xml?rev=756973&r1=756972&r2=756973&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1.4/plugins/tomcat/tomcat6-deployer/pom.xml Sat Mar 21 17:12:50
2009
@@ -94,28 +94,33 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-tomcat6-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-deployer</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-web-2.5-builder</artifactId>
+                            <version>${version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat6</artifactId>
+                            <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>



Mime
View raw message