You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Ivan <xh...@gmail.com> on 2010/01/12 16:08:58 UTC
Re: svn commit: r898356 - in /geronimo/server/trunk: ./
plugins/activemq/activemq-portlets/ plugins/axis2/axis2/src/main/history/
plugins/ca-helper/geronimo-ca-helper/ plugins/client/client/src/main/history/
plugins/concurrent/geronimo-concurrent-bui
Thanks, Rick !
2010/1/12 <ri...@apache.org>
> Author: rickmcguire
> Date: Tue Jan 12 15:06:36 2010
> New Revision: 898356
>
> URL: http://svn.apache.org/viewvc?rev=898356&view=rev
> Log:
> Update for renamed spec versions.
>
>
> Modified:
> geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
>
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
>
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
>
> geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
> geronimo/server/trunk/plugins/console/console-core/pom.xml
> geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
> geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
>
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
>
> geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
> geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
> geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
> geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
> geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
> geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
> geronimo/server/trunk/plugins/openejb/openejb/pom.xml
>
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
>
> geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
> geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml
> geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
> geronimo/server/trunk/pom.xml
> geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
>
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
>
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
>
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
>
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
>
> geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
>
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
>
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
>
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
>
> geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
> geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
> geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
> geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
> geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
> geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
>
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
>
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
>
> geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
>
> geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
>
> geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
>
> geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
>
> geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
>
> Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Tue
> Jan 12 15:06:36 2010
> @@ -43,7 +43,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </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=898356&r1=898355&r2=898356&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
> Tue Jan 12 15:06:36 2010
> @@ -128,6 +128,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
> <type>jar</type>
> </dependency>
>
> Modified:
> geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml Tue
> Jan 12 15:06:36 2010
> @@ -65,7 +65,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
>
> 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=898356&r1=898355&r2=898356&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
> Tue Jan 12 15:06:36 2010
> @@ -103,7 +103,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
> (original)
> +++
> geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -42,7 +42,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
>
> <dependency>
> @@ -75,5 +75,5 @@
> <version>${version}</version>
> </dependency>
> </dependencies>
> -
> +
> </project>
>
> Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
> +++ geronimo/server/trunk/plugins/console/console-core/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -78,7 +78,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> </dependency>
> </dependencies>
> <build>
>
> Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original)
> +++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -27,7 +27,7 @@
> <artifactId>cxf</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-cxf</artifactId>
> <packaging>bundle</packaging>
> @@ -62,7 +62,7 @@
> <groupId>org.apache.cxf</groupId>
> <artifactId>cxf-rt-transports-http</artifactId>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.cxf</groupId>
> <artifactId>cxf-rt-ws-security</artifactId>
> @@ -70,7 +70,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
> </dependencies>
>
>
> Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Tue
> Jan 12 15:06:36 2010
> @@ -57,7 +57,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> Tue Jan 12 15:06:36 2010
> @@ -58,7 +58,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
> +++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -58,7 +58,7 @@
> <groupId>org.apache.servicemix.bundles</groupId>
> <artifactId>org.apache.servicemix.bundles.ant</artifactId>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.framework</groupId>
> <artifactId>geronimo-kernel</artifactId>
> @@ -80,14 +80,12 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> - <scope>provided</scope>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> </dependency>
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-el_1.0_spec</artifactId>
> - <scope>provided</scope>
> + <artifactId>geronimo-el_2.2_spec</artifactId>
> </dependency>
>
> <!--
>
> Modified:
> geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
> Tue Jan 12 15:06:36 2010
> @@ -1,5 +1,5 @@
> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
> -<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
> xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
> +<plugin-artifact xmlns:ns2="
> http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="
> http://geronimo.apache.org/xml/ns/plugins-1.3">
> <module-id>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>jasper</artifactId>
> @@ -58,10 +58,20 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-el_2.2_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.servicemix.bundles</groupId>
> <artifactId>org.apache.servicemix.bundles.ant</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
> +++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -68,7 +68,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
>
> <!--<dependency>-->
>
> Modified: geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml (original)
> +++ geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -26,7 +26,7 @@
> <artifactId>mejb</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>geronimo-mejb</artifactId>
> <name>Geronimo Plugins, MEJB :: Core</name>
>
> @@ -41,7 +41,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml (original)
> +++ geronimo/server/trunk/plugins/monitoring/agent-ejb/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -6,9 +6,9 @@
> The ASF licenses this file 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 KIND, either express or
> implied.
> @@ -21,7 +21,7 @@
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
>
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <groupId>org.apache.geronimo.plugins.monitoring</groupId>
> <artifactId>monitoring</artifactId>
> @@ -40,26 +40,26 @@
> <version>${version}</version>
> <scope>provided</scope>
> </dependency>
> -
> +
> <!--TODO GERONIMO-3719 hack fix -->
> <dependency>
> <groupId>org.apache.servicemix.bundles</groupId>
> <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
>
> Modified: geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
> +++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -54,7 +54,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-el_1.0_spec</artifactId>
> + <artifactId>geronimo-el_2.2_spec</artifactId>
> </dependency>
>
> <dependency>
> @@ -64,7 +64,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> </dependency>
>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Tue Jan
> 12 15:06:36 2010
> @@ -42,7 +42,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Tue Jan
> 12 15:06:36 2010
> @@ -41,7 +41,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
> +++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -39,7 +39,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> </dependency>
>
> <dependency>
>
> Modified:
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> Tue Jan 12 15:06:36 2010
> @@ -48,7 +48,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
>
> Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
> +++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Tue Jan 12
> 15:06:36 2010
> @@ -59,12 +59,12 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> </dependency>
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-el_1.0_spec</artifactId>
> + <artifactId>geronimo-el_2.2_spec</artifactId>
> </dependency>
>
> <dependency>
>
> Modified:
> geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
> Tue Jan 12 15:06:36 2010
> @@ -58,12 +58,12 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-el_1.0_spec</artifactId>
> + <artifactId>geronimo-el_2.2_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -6,9 +6,9 @@
> The ASF licenses this file 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 KIND, either express or
> implied.
> @@ -31,7 +31,7 @@
> <artifactId>sysdb-portlets</artifactId>
> <name>Geronimo Plugins, System Database :: Portlets</name>
> <packaging>war</packaging>
> -
> +
> <dependencies>
> <!-- for jspc maven plugin -->
> <dependency>
> @@ -41,7 +41,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
> @@ -143,7 +143,7 @@
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <plugin>
> @@ -183,7 +183,7 @@
> <plugin>
> <groupId>org.codehaus.mojo</groupId>
> <artifactId>native2ascii-maven-plugin</artifactId>
> - </plugin>
> + </plugin>
> </plugins>
> </build>
>
>
> Modified:
> geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -50,7 +50,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>test</scope>
> </dependency>
>
>
> Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml Tue Jan
> 12 15:06:36 2010
> @@ -6,9 +6,9 @@
> The ASF licenses this file 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 KIND, either express or
> implied.
> @@ -27,7 +27,7 @@
> <artifactId>uddi</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>geronimo-uddi-server</artifactId>
> <name>Geronimo Plugins, UDDI Server :: Core</name>
> <packaging>war</packaging>
> @@ -41,7 +41,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
>
> Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml Tue Jan
> 12 15:06:36 2010
> @@ -6,9 +6,9 @@
> The ASF licenses this file 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 KIND, either express or
> implied.
> @@ -48,7 +48,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified: geronimo/server/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Tue Jan 12 15:06:36 2010
> @@ -246,8 +246,8 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> - <version>1.1.1</version>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> + <version>1.0-SNAPSHOT</version>
> </dependency>
>
> <dependency>
> @@ -511,7 +511,7 @@
> <artifactId>org.apache.servicemix.bundles.ant</artifactId>
> <version>1.7.0_1</version>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.servicemix.bundles</groupId>
>
> <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
> @@ -1660,7 +1660,7 @@
> </exclusion>
> </exclusions>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>woden-impl-dom</artifactId>
>
> Modified: geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/commands-testsuite/jaxws/pom.xml Tue
> Jan 12 15:06:36 2010
> @@ -41,7 +41,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -42,7 +42,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
>
> Modified:
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -48,7 +48,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -47,7 +47,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -53,7 +53,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
>
> Modified:
> geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,9 +21,9 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <groupId>org.apache.geronimo.testsuite</groupId>
> <artifactId>jca-cms-tests</artifactId>
> @@ -33,20 +33,20 @@
> <artifactId>jca-cms-war</artifactId>
> <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container
> Managed Security WAR</name>
> <packaging>war</packaging>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.framework</groupId>
> <artifactId>geronimo-security</artifactId>
> @@ -54,7 +54,7 @@
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <plugin>
>
> Modified:
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -45,15 +45,15 @@
> <version>${version}</version>
> <scope>provided</scope>
> </dependency>
> -
> +
> <!--
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -->
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
>
> Modified:
> geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $
> -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -32,7 +32,7 @@
>
> <artifactId>ejb-tests</artifactId>
> <packaging>pom</packaging>
> -
> +
> <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests</name>
>
> <dependencies>
> @@ -41,10 +41,10 @@
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -\
> +\
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
>
> Modified:
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,39 +21,39 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <artifactId>jms-tests</artifactId>
> <groupId>org.apache.geronimo.testsuite</groupId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <groupId>org.apache.geronimo.testsuite</groupId>
> <artifactId>jms-ejb</artifactId>
> <packaging>ejb</packaging>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-api</artifactId>
> <version>1.5.0</version>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jms_1.1_spec</artifactId>
> <version>1.1.1</version>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jta_1.1_spec</artifactId>
> @@ -62,12 +62,12 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> - <version>1.1.1</version>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> + <version>1.0-SNAPSHOT</version>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <plugin>
>
> Modified:
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -33,7 +33,7 @@
> <artifactId>jms-war</artifactId>
> <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS WAR</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for JMS
> </description>
> @@ -42,17 +42,17 @@
> <!--
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -->
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jms_1.1_spec</artifactId>
> @@ -61,10 +61,10 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> - <version>1.1.1</version>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> + <version>1.0-SNAPSHOT</version>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -40,13 +40,13 @@
> <artifactId>geronimo-jpa_2.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jta_1.1_spec</artifactId>
> <scope>test</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
> @@ -54,7 +54,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
> @@ -74,5 +74,5 @@
> </plugin>
> </plugins>
> </build>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Tue
> Jan 12 15:06:36 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
> @@ -41,7 +41,7 @@
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Tue
> Jan 12 15:06:36 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
> @@ -37,7 +37,7 @@
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
> @@ -62,7 +62,7 @@
> </plugin>
> </plugins>
> </pluginManagement>
> -
> +
> <plugins>
> <plugin>
> <groupId>org.apache.geronimo.buildsupport</groupId>
>
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Tue
> Jan 12 15:06:36 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
> @@ -23,13 +23,13 @@
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
>
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <groupId>org.apache.geronimo.testsuite</groupId>
> <artifactId>web-testsuite</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>test-jetty</artifactId>
> <name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
> <packaging>war</packaging>
> @@ -37,11 +37,11 @@
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <pluginManagement>
> <plugins>
> @@ -56,7 +56,7 @@
> </plugin>
> </plugins>
> </pluginManagement>
> -
> +
> <plugins>
> <plugin>
> <groupId>org.apache.geronimo.buildsupport</groupId>
> @@ -72,7 +72,7 @@
>
> <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
> </configuration>
> </execution>
> -
> +
> <execution>
> <id>undeploy-war-as-moduleId</id>
> <phase>post-integration-test</phase>
>
> Modified:
> geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Tue
> Jan 12 15:06:36 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
> @@ -40,7 +40,7 @@
> <artifactId>slf4j-api</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.myfaces.core</groupId>
> <artifactId>myfaces-api</artifactId>
> @@ -49,7 +49,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> @@ -68,7 +68,7 @@
> </plugin>
> </plugins>
> </pluginManagement>
> -
> +
> <plugins>
> <plugin>
> <groupId>org.apache.geronimo.buildsupport</groupId>
>
> Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
> (original)
> +++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Tue
> Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -29,15 +29,15 @@
> <artifactId>web-testsuite</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>test-tomcat</artifactId>
> <name>Geronimo TestSuite :: Web Testsuite :: Test Tomcat</name>
> <packaging>war</packaging>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> @@ -56,7 +56,7 @@
> </plugin>
> </plugins>
> </pluginManagement>
> -
> +
> <plugins>
> <plugin>
> <groupId>org.apache.geronimo.buildsupport</groupId>
> @@ -72,7 +72,7 @@
>
> <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
> </configuration>
> </execution>
> -
> +
> <execution>
> <id>undeploy-war-as-moduleId</id>
> <phase>post-integration-test</phase>
>
> Modified:
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -29,27 +29,27 @@
> <artifactId>test-web-forward</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>web-forward-war-1</artifactId>
> <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR I</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for Servlet forwarding
> </description>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -23,33 +23,33 @@
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
>
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <groupId>org.apache.geronimo.testsuite</groupId>
> <artifactId>test-web-forward</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>web-forward-war-2</artifactId>
> <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR II</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for Servlet forwarding
> </description>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -23,21 +23,21 @@
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
>
> <modelVersion>4.0.0</modelVersion>
> -
> +
> <parent>
> <groupId>org.apache.geronimo.testsuite</groupId>
> <artifactId>test-web-references</artifactId>
> <version>3.0-SNAPSHOT</version>
> </parent>
> -
> +
> <artifactId>web-references-war</artifactId>
> <name>Geronimo Test Suite :: Test Web References :: WAR</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for web references
> </description>
> -
> +
> <dependencies>
> <dependency>
> <groupId>org.apache.geronimo.testsuite</groupId>
> @@ -46,25 +46,25 @@
> <scope>provided</scope>
> <type>ejb</type>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jms_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-ejb_3.1_spec</artifactId>
> @@ -77,5 +77,5 @@
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -40,11 +40,11 @@
> <!--
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -->
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -40,17 +40,17 @@
> <!--
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -->
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jaxr_1.0_spec</artifactId>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -43,7 +43,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -45,10 +45,10 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.servicemix.bundles</groupId>
> <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -43,7 +43,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -19,9 +19,9 @@
> -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> - <modelVersion>4.0.0</modelVersion>
> -
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> <parent>
> <artifactId>webservices-testsuite</artifactId>
> <groupId>org.apache.geronimo.testsuite</groupId>
> @@ -52,7 +52,7 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> <dependency>
> @@ -66,7 +66,7 @@
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <modules>
> <module>provider-test-war</module>
> <module>provider-war</module>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -45,7 +45,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
> Tue Jan 12 15:06:36 2010
> @@ -45,7 +45,7 @@
>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-annotation_1.0_spec</artifactId>
> + <artifactId>geronimo-annotation_1.1_spec</artifactId>
> <scope>provided</scope>
> </dependency>
>
>
> Modified:
> geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $
> -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -40,17 +40,17 @@
> <!--
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -->
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> </dependencies>
>
> <build>
> @@ -67,7 +67,7 @@
> </systemProperties>
> </configuration>
> </plugin>
> -
> +
> <plugin>
> <groupId>org.apache.geronimo.buildsupport</groupId>
> <artifactId>geronimo-maven-plugin</artifactId>
> @@ -82,7 +82,7 @@
>
> <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
> </configuration>
> </execution>
> -
> +
> <execution>
> <id>undeploy-war-as-moduleId</id>
> <phase>post-integration-test</phase>
>
> 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?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> 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
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -33,7 +33,7 @@
> <artifactId>test-war-j2ee_1.3</artifactId>
> <name>Geronimo Test Support, Test Deployment J2EE 1.3 :: WAR</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for J2EE 1.3.
> </description>
> @@ -46,20 +46,20 @@
> <scope>provided</scope>
> <type>ejb</type>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <!--
> @@ -75,5 +75,5 @@
> </plugin>
> </plugins>
> </build>
> -
> +
> </project>
>
> 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?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> 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
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -33,7 +33,7 @@
> <artifactId>test-war-j2ee_1.4</artifactId>
> <name>Geronimo Test Support, Test Deployment J2EE 1.4 :: WAR</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for J2EE 1.4.
> </description>
> @@ -46,20 +46,20 @@
> <scope>provided</scope>
> <type>ejb</type>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <!--
> @@ -75,5 +75,5 @@
> </plugin>
> </plugins>
> </build>
> -
> +
> </project>
>
> Modified:
> geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml?rev=898356&r1=898355&r2=898356&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
> (original)
> +++
> geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
> Tue Jan 12 15:06:36 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
> @@ -21,7 +21,7 @@
> <!-- $Rev$ $Date$ -->
>
> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> -
> +
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -33,7 +33,7 @@
> <artifactId>test-war-javaee_5</artifactId>
> <name>Geronimo Test Support, Test Deployment JavaEE 5 :: WAR</name>
> <packaging>war</packaging>
> -
> +
> <description>
> Geronimo test WAR for JavaEE 5.
> </description>
> @@ -46,20 +46,20 @@
> <scope>provided</scope>
> <type>ejb</type>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
> + <artifactId>geronimo-jsp_2.2_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> -
> +
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-servlet_3.0_spec</artifactId>
> <scope>provided</scope>
> </dependency>
> </dependencies>
> -
> +
> <build>
> <plugins>
> <!--
> @@ -75,5 +75,5 @@
> </plugin>
> </plugins>
> </build>
> -
> +
> </project>
>
>
>
--
Ivan