You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/01/12 03:36:20 UTC
svn commit: r495470 - in /geronimo/server/trunk: ./
applications/geronimo-ca-helper/ assemblies/geronimo-boilerplate-jee5/
configs/axis-deployer/ configs/axis2/ configs/ca-helper-tomcat/
configs/dojo-jetty6/ configs/j2ee-deployer/ configs/jee-specs/ co...
Author: jdillon
Date: Thu Jan 11 18:36:18 2007
New Revision: 495470
URL: http://svn.apache.org/viewvc?view=rev&rev=495470
Log:
Use ${version} instead of ${pom.version} or ${geronimoVersion} for deps
Fixed some deps to use the DM config for their version, created missing DM for el spec
Drop duplicate annotation in DM
Using geronimo-jta_1.1_spec everywhere geronimo-jta_1.0.1B_spec was used before
Few comments on future version fixes that need to be made
Dropped some obvious copy-paste of pom scm and build elements which are uneeded
Modified:
geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
geronimo/server/trunk/configs/axis-deployer/pom.xml
geronimo/server/trunk/configs/axis2/pom.xml
geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
geronimo/server/trunk/configs/dojo-jetty6/pom.xml
geronimo/server/trunk/configs/j2ee-deployer/pom.xml
geronimo/server/trunk/configs/jee-specs/pom.xml
geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/configs/jetty6-deployer/pom.xml
geronimo/server/trunk/configs/jetty6/pom.xml
geronimo/server/trunk/configs/openejb-deployer/pom.xml
geronimo/server/trunk/configs/openjpa/pom.xml
geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
geronimo/server/trunk/configs/transaction-jta11/pom.xml
geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
geronimo/server/trunk/configs/webservices-common/pom.xml
geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
geronimo/server/trunk/modules/geronimo-axis2/pom.xml
geronimo/server/trunk/modules/geronimo-client/pom.xml
geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
geronimo/server/trunk/modules/geronimo-cxf/pom.xml
geronimo/server/trunk/modules/geronimo-directory/pom.xml
geronimo/server/trunk/modules/geronimo-directory/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
geronimo/server/trunk/modules/geronimo-naming/pom.xml
geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml
geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml
geronimo/server/trunk/modules/geronimo-timer/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
geronimo/server/trunk/modules/geronimo-transaction/pom.xml
geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
Modified: geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml Thu Jan 11 18:36:18 2007
@@ -43,14 +43,14 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml Thu Jan 11 18:36:18 2007
@@ -165,7 +165,7 @@
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transformer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
Modified: geronimo/server/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/pom.xml Thu Jan 11 18:36:18 2007
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Thu Jan 11 18:36:18 2007
@@ -67,6 +67,7 @@
<!--todo: tweak/add other Axis2 dependencies as needed.
currently getting Axis2 dependencies from repo
http://people.apache.org/repo/m2-ibiblio-rsync-repository/-->
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
Modified: geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ca-helper</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
<scope>test</scope>
</dependency>
@@ -73,7 +73,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ca-helper</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -73,7 +73,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Thu Jan 11 18:36:18 2007
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
<scope>runtime</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
<scope>runtime</scope>
</dependency>
Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Thu Jan 11 18:36:18 2007
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -55,7 +54,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -96,12 +94,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml Thu Jan 11 18:36:18 2007
@@ -42,32 +42,32 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,20 +37,20 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>wadi-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>runtime</scope>
</dependency>
@@ -61,13 +61,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-web-2.5-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,21 +38,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-jta11</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -60,13 +60,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Thu Jan 11 18:36:18 2007
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Thu Jan 11 18:36:18 2007
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-jta11</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml Thu Jan 11 18:36:18 2007
@@ -39,20 +39,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa10-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-jta11</artifactId>
<type>car</type>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>runtime</scope>
</dependency>
Modified: geronimo/server/trunk/configs/transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -46,13 +46,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -68,25 +68,25 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction-jta11</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa10</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transformer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Thu Jan 11 18:36:18 2007
@@ -38,21 +38,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>dojo-jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -60,39 +60,39 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
<!--<artifactId>cxf-deployer</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--<type>car</type>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
@@ -100,37 +100,37 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-converter</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-upgrade</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -212,7 +212,7 @@
<module>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/configs/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/configs/webservices-common/pom.xml Thu Jan 11 18:36:18 2007
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,30 +37,27 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis2</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
- <build>
- </build>
-
</project>
Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Thu Jan 11 18:36:18 2007
@@ -54,8 +54,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
+ <!--
+ FIXME: Use dependencyManagement for versions!
+ -->
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client/pom.xml Thu Jan 11 18:36:18 2007
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,24 +37,25 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-cxf</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- this is a dependency of geronimo-cxf. Why isn't it picked up? -->
@@ -63,11 +64,7 @@
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
-
</dependencies>
-
- <build>
- </build>
</project>
Modified: geronimo/server/trunk/modules/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -51,9 +51,6 @@
</dependency>
</dependencies>
-
- <build>
- </build>
</project>
Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Thu Jan 11 18:36:18 2007
@@ -134,7 +134,11 @@
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
</dependency>
-
+
+ <!--
+ FIXME: Use dependencyManagement for versions!
+ -->
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Modified: geronimo/server/trunk/modules/geronimo-directory/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/src/main/resources/META-INF/geronimo-dependency.xml Thu Jan 11 18:36:18 2007
@@ -17,6 +17,11 @@
-->
<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+ <!--
+ FIXME: Do not specify versions, let G pickup the version that is in the repo.
+ -->
+
<dep:dependency>
<dep:groupId>directory</dep:groupId>
<dep:artifactId>apacheds-core</dep:artifactId>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,13 +37,13 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-web-2.5-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,13 +37,13 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-jetty6-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- Thirdparty Dependencies -->
Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml Thu Jan 11 18:36:18 2007
@@ -36,13 +36,13 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-jetty6</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Thu Jan 11 18:36:18 2007
@@ -36,36 +36,36 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-clustering-wadi</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Thu Jan 11 18:36:18 2007
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,29 +37,31 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-persistence-jpa10</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml Thu Jan 11 18:36:18 2007
@@ -33,51 +33,25 @@
<artifactId>geronimo-persistence-jpa10</artifactId>
<name>Geronimo :: Persistence 3.0</name>
- <!--
-
- HACK: Need to explicitly configure SCM for this module since its artifactId
- does not match the directory it lives in.
-
- FIXME: Rename module directory or artifactId.
-
- -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/trunk/modules/transaction</connection>
- <developerConnection>
- scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/transaction</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transformer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -88,7 +62,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Thu Jan 11 18:36:18 2007
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Thu Jan 11 18:36:18 2007
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml Thu Jan 11 18:36:18 2007
@@ -33,91 +33,32 @@
<artifactId>geronimo-transaction-jta11</artifactId>
<name>Geronimo :: Transaction JTA 11</name>
- <!--
-
- HACK: Need to explicitly configure SCM for this module since its artifactId
- does not match the directory it lives in.
-
- FIXME: Rename module directory or artifactId.
-
- -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/trunk/modules/transaction</connection>
- <developerConnection>
- scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/transaction</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>validate-java-version</id>
- <phase>validate</phase>
- <goals>
- <goal>require-java-version</goal>
- </goals>
- <configuration>
- <version>1.5*</version>
- </configuration>
- </execution>
-
- <!--
- NOTE: This will copy LICENSE.txt and NOTICE.txt to classes/META-INF.
-
- Its a itty-bitty HACK to avoid adding resource definitions to
- the build, which causes the Eclipse plugin to generate invalid
- .classpath files. :-(
- -->
- <execution>
- <id>install-legal-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-legal-files</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- thread pool, for timer -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Thu Jan 11 18:36:18 2007
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,7 +37,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Thu Jan 11 18:36:18 2007
@@ -37,37 +37,37 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jan 11 18:36:18 2007
@@ -172,7 +172,13 @@
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -220,12 +226,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Thu Jan 11 18:36:18 2007
@@ -32,23 +32,23 @@
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>manifestcp-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>manifestcp-war-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>manifestcp-ejb</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>manifestcp-war</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Thu Jan 11 18:36:18 2007
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>manifestcp-war-jar</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Thu Jan 11 18:36:18 2007
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jpa-ejb</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jpa-war</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?view=diff&rev=495470&r1=495469&r2=495470
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Thu Jan 11 18:36:18 2007
@@ -33,23 +33,23 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>0.9.6-incubating-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
- <version>1.0.1</version>
<scope>provided</scope>
</dependency>