Fabian,
Does it require an open source review? I see changes to groupId for
existing dependency and addition of a new artifact. Can you please check
with program management (Carla C.) before committing? Please mention
license details to them. Let me analyse the runtime impact of switching
to Woodstox bundles as well. I will get back in a while.
Thanks,
Sahoo
On Thursday 09 June 2011 07:28 PM, Fabian Ritzmann wrote:
> Hi,
>
> Please review the Metro integration changes. Metro 2.1.1-b06 delivers JAX-WS
> RI 2.2.5, JAXB RI 2.2.4 and most importantly, Woodstox 4.1.1 to replace our
> hand-crafted OSGi bundle of Woodstox 3.2.1.
>
> The changes are slightly bigger than usual because woodstox-osgi.jar is
> replaced by the two libraries that make up Woodstox 4.1.1 - woodstox-core-
> asl.jar and stax2-api.jar.
>
> I also took the opportunity to rename the confusingly named jaxrpc.api.version
> (there is also a jaxrpc-api.version) to jaxrpc-api-osgi.version.
>
> I am still running the QL and JSR 109 tests and will of course only check in
> if they pass.
>
> Index: pom.xml
> ===================================================================
> --- pom.xml (revision 47393)
> +++ pom.xml (working copy)
> @@ -108,7 +108,6 @@
> <jsf-impl.version>2.1.1-b04</jsf-impl.version>
> <jsf-ext.version>0.2</jsf-ext.version>
> <woodstock.version>4.0.2.7</woodstock.version>
> -<jaxrpc-api.version>1.1</jaxrpc-api.version>
> <grizzly.version>1.9.35</grizzly.version>
> <jsr181-api.version>1.0-MR1</jsr181-api.version>
> <saaj-api.version>1.3</saaj-api.version>
> @@ -128,12 +127,15 @@
> <glassfish-corba.version>3.2.0-b002</glassfish-corba.version>
> <uc-pkg-client.version>1.122-50.2809</uc-pkg-client.version>
> <uc-pkg-bootstrap.version>1.122-50.2809</uc-pkg-bootstrap.version>
> -<webservices.version>2.1.1-b05</webservices.version>
> -<woodstox.version>3.2.1.1</woodstox.version>
> -<jaxb-api.version>2.2.2</jaxb-api.version>
> -<jaxb.version>2.2.3-1</jaxb.version>
> -<jaxrpc.api.version>1.1-b01</jaxrpc.api.version>
>
> +<webservices.version>2.1.1-b06</webservices.version>
> +<woodstox.version>4.1.1</woodstox.version>
> +<woodstox-stax2.version>3.1.1</woodstox-stax2.version>
> +<jaxb-api.version>2.2.3</jaxb-api.version>
> +<jaxb.version>2.2.4</jaxb.version>
> +<jaxrpc-api.version>1.1</jaxrpc-api.version>
> +<jaxrpc-api-osgi.version>1.1-b01</jaxrpc-api-osgi.version>
> +
> <javax-persistence-api.version>2.0.3</javax-persistence-api.version>
> <eclipselink.version>2.3.0-RC4</eclipselink.version>
> <dbschema.version>RELEASE60</dbschema.version>
> @@ -1027,11 +1029,16 @@
> </dependency>
>
> <dependency>
> -<groupId>com.ctc.wstx</groupId>
> -<artifactId>woodstox-osgi</artifactId>
> +<groupId>org.codehaus.woodstox</groupId>
> +<artifactId>woodstox-core-asl</artifactId>
> <version>${woodstox.version}</version>
> </dependency>
> <dependency>
> +<groupId>org.codehaus.woodstox</groupId>
> +<artifactId>stax2-api</artifactId>
> +<version>${woodstox-stax2.version}</version>
> +</dependency>
> +<dependency>
> <groupId>org.glassfish.metro</groupId>
> <artifactId>webservices-osgi</artifactId>
> <version>${webservices.version}</version>
> @@ -1055,7 +1062,7 @@
> <dependency>
> <groupId>javax.xml</groupId>
> <artifactId>jaxrpc-api-osgi</artifactId>
> -<version>${jaxrpc.api.version}</version>
> +<version>${jaxrpc-api-osgi.version}</version>
> </dependency>
> <dependency>
> <groupId>com.sun.xml.bind</groupId>
> Index: packager/legal/3RD-PARTY-LICENSE.txt
> ===================================================================
> --- packager/legal/3RD-PARTY-LICENSE.txt (revision 47393)
> +++ packager/legal/3RD-PARTY-LICENSE.txt (working copy)
> @@ -1577,7 +1577,7 @@
> ****************************************
>
> ---------------------------------------------------
> -Woodstox 4.0.8
> +Woodstox 4.1.1
> Apache Commons Jelly 1.0
> Apache Commons Jelly tags define 1.0
> Apache Commons Jelly tags XML 1.1
> Index: packager/metro/pom.xml
> ===================================================================
> --- packager/metro/pom.xml (revision 47393)
> +++ packager/metro/pom.xml (working copy)
> @@ -105,10 +105,14 @@
> <artifactId>jaxb-api-osgi</artifactId>
> </dependency>
> <dependency>
> -<groupId>com.ctc.wstx</groupId>
> -<artifactId>woodstox-osgi</artifactId>
> +<groupId>org.codehaus.woodstox</groupId>
> +<artifactId>woodstox-core-asl</artifactId>
> </dependency>
> <dependency>
> +<groupId>org.codehaus.woodstox</groupId>
> +<artifactId>stax2-api</artifactId>
> +</dependency>
> +<dependency>
> <groupId>org.glassfish.metro</groupId>
> <artifactId>webservices-osgi</artifactId>
> </dependency>
> Index: packager/resources/pkg_conf.py
> ===================================================================
> --- packager/resources/pkg_conf.py (revision 47393)
> +++ packager/resources/pkg_conf.py (working copy)
> @@ -66,7 +66,7 @@
> corba_version="3.2.0,0-2"
> jsf_version="2.1.1,0-4"
> grizzly_version="1.9.35,0-1"
> -metro_version="2.1.1,0-1"
> +metro_version="2.1.1,0-6"
> javahelp_version="2.0.2,0-1"
> shoal_version="1.5.32,0-0"