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 2006/10/27 05:00:12 UTC
svn commit: r468245 [4/4] - in /geronimo/server/trunk: ./
applications/console/geronimo-console-core/
applications/console/geronimo-console-ear/
applications/console/geronimo-console-standard/ applications/geronimo-dojo/
applications/geronimo-remote-de...
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=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Thu Oct 26 20:00:05 2006
@@ -49,31 +49,31 @@
<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-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-kernel</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-tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,55 +36,55 @@
<!--<dependency>-->
<!--<groupId>${pom.groupId}</groupId>-->
<!--<artifactId>geronimo-deployment</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>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<!--<dependency>-->
<!--<groupId>${pom.groupId}</groupId>-->
<!--<artifactId>geronimo-axis</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Thu Oct 26 20:00:05 2006
@@ -66,43 +66,43 @@
<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-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<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-transaction</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-security-builder</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=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,13 +36,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-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,19 +36,19 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</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>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,39 +36,39 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-service-builder</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>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- might not be needed -->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,19 +36,19 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-interceptor</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<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>
Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>testsupport-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Oct 26 20:00:05 2006
@@ -45,6 +45,16 @@
</scm>
<properties>
+ <!--
+ NOTE: Project version, to be used instead of ${pom.version} since that
+ value magically changes when using SNAPSHOT versions.
+
+ This value *must* be kept in sync with the value of the <version>
+ element, and it will need to be changed manually before a release,
+ as the maven-release-plugin will not update this value.
+ -->
+ <version>1.2-SNAPSHOT</version>
+
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
<!--
@@ -90,7 +100,13 @@
<artifactId>geronimo-spec-corba</artifactId>
<version>1.0</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-corba_2.3_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
@@ -1026,7 +1042,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<configuration>
<assemblies>
@@ -1034,7 +1050,7 @@
<id>jetty</id>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-jetty-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>
</assembly>
@@ -1043,7 +1059,7 @@
<id>jetty-minimal</id>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-jetty-minimal</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>
</assembly>
@@ -1052,7 +1068,7 @@
<id>tomcat</id>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>
</assembly>
@@ -1061,7 +1077,7 @@
<id>tomcat-minimal</id>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat-minimal</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>
</assembly>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Thu Oct 26 20:00:05 2006
@@ -83,14 +83,14 @@
<module>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</module>
<module>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>test-ear-j2ee_1.4</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</module>
</modules>
@@ -108,7 +108,7 @@
<module>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</module>
</modules>
@@ -122,7 +122,7 @@
<goal>undeploy-module</goal>
</goals>
<configuration>
- <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${pom.version}/ear</moduleId>
+ <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
</configuration>
</execution>
</executions>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Thu Oct 26 20:00:05 2006
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>testsupport-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</plugin>
<plugin>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml Thu Oct 26 20:00:05 2006
@@ -44,21 +44,21 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-war-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-ejb-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-rar-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml Thu Oct 26 20:00:05 2006
@@ -26,7 +26,7 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</moduleId>
</environment>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml Thu Oct 26 20:00:05 2006
@@ -44,7 +44,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-ejb-j2ee_1.3</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>provided</scope>
<type>ejb</type>
</dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml Thu Oct 26 20:00:05 2006
@@ -44,21 +44,21 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-war-j2ee_1.4</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-ejb-j2ee_1.4</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-rar-j2ee_1.4</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml Thu Oct 26 20:00:05 2006
@@ -26,7 +26,7 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>ear</type>
</moduleId>
</environment>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml Thu Oct 26 20:00:05 2006
@@ -44,7 +44,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>test-ejb-j2ee_1.4</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<scope>provided</scope>
<type>ejb</type>
</dependency>