You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/04/08 14:29:07 UTC
svn commit: r931908 - in /geronimo/server/trunk: ./
framework/configs/j2ee-security/src/main/history/
framework/configs/jsr88-cli/src/main/history/
framework/configs/shutdown/src/main/history/
framework/modules/geronimo-security/ plugins/aries/aries-de...
Author: rickmcguire
Date: Thu Apr 8 12:29:06 2010
New Revision: 931908
URL: http://svn.apache.org/viewvc?rev=931908&view=rev
Log:
GERONIMO-5242 Make spec version naming conventions consistent.
Updating trunk to new spec numbering rules.
Modified:
geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
geronimo/server/trunk/plugins/pluto/pom.xml
geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -22,6 +22,21 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.commands</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -22,6 +22,21 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.commands</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Thu Apr 8 12:29:06 2010
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -163,7 +163,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -143,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -66,4 +66,9 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -76,4 +76,9 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -7,6 +7,21 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.commands</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.gogo</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf.shell</groupId>
+ <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -23,6 +23,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -193,7 +193,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/pom.xml Thu Apr 8 12:29:06 2010
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Thu Apr 8 12:29:06 2010
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ccpp_1.0_spec</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Thu Apr 8 12:29:06 2010
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Apr 8 12:29:06 2010
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-osgi-registry</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -149,13 +149,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -167,19 +167,19 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>geronimo-jacc_1.4_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -196,7 +196,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8-SNAPSHOT</version>
+ <version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -494,7 +494,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
@@ -1333,7 +1333,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.2_spec</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=931908&r1=931907&r2=931908&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Thu Apr 8 12:29:06 2010
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,11 +33,11 @@
<artifactId>jms-ear</artifactId>
<name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EAR</name>
<packaging>ear</packaging>
-
+
<!--
FIXME: Split this module up... one to build the ear, one to run the tests.
-->
-
+
<description>
Geronimo test EAR for JMS.
</description>
@@ -49,29 +49,29 @@
<version>${version}</version>
<type>war</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>jms-ejb</artifactId>
<version>${version}</version>
<type>ejb</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -205,5 +205,5 @@
</build>
</profile>
</profiles>
-
+
</project>