On 3/12/12 4:25 AM, Lukas Jungmann wrote:
> Hi,
>
> Please review change to update Metro version and mimepull version
> (this one is shared with Jersey) in trunk.
>
> Quicklook, devtests for webservices and CTS smoke tests are passing
> for me locally. Admin/rest tests are behaving the same on my box with
> and without my change in mimepull version.
>
>
> Regards,
> --lukas
>
>
> Index: appserver/packager/glassfish-common/pom.xml
> ===================================================================
> --- appserver/packager/glassfish-common/pom.xml (revision 52834)
> +++ appserver/packager/glassfish-common/pom.xml (working copy)
> @@ -3,7 +3,7 @@
>
> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
>
> - Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights
> reserved.
> + Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights
> reserved.
>
> The contents of this file are subject to the terms of either the GNU
> General Public License Version 2 only ("GPL") or the Common
> Development
> @@ -145,7 +145,7 @@
>
> <!-- mimepull - shared dependency of metro and jersey -->
> <dependency>
> - <groupId>org.jvnet</groupId>
> + <groupId>org.jvnet.mimepull</groupId>
> <artifactId>mimepull</artifactId>
> </dependency>
>
> Index: appserver/packager/resources/pkg_conf.py
> ===================================================================
> --- appserver/packager/resources/pkg_conf.py (revision 52834)
> +++ appserver/packager/resources/pkg_conf.py (working copy)
> @@ -66,7 +66,7 @@
> corba_version="3.2.0,0-6"
> jsf_version="2.1.3,0-4"
> grizzly_version="2.1.9,0-0"
> -metro_version="2.1,0-30"
> +metro_version="2.3,0-30"
> javahelp_version="2.0.2,0-1"
> shoal_version="1.6.17,0-0"
>
> Index: pom.xml
> ===================================================================
> --- pom.xml (revision 52834)
> +++ pom.xml (working copy)
> @@ -132,10 +132,10 @@
>
> <uc-pkg-client.version>1.122-54.2834</uc-pkg-client.version>
> <uc-pkg-bootstrap.version>1.122-54.2834</uc-pkg-bootstrap.version>
> - <webservices.version>2.1</webservices.version>
> + <webservices.version>2.3-b10</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>
> + <jaxb-api.version>2.2.6</jaxb-api.version>
> + <jaxb.version>2.2.5</jaxb.version>
> <jaxrpc.api.version>1.1-b01</jaxrpc.api.version>
>
>
> <javax-persistence-api.version>2.0.4.v201112200901</javax-persistence-api.version>
>
> @@ -157,7 +157,7 @@
> <jbi.version>1.0</jbi.version>
> <wsdl4j.version>1.6.2</wsdl4j.version>
>
> <glassfish-management-api.version>3.1.0-b001</glassfish-management-api.version>
>
> - <mimepull.version>1.5</mimepull.version>
> + <mimepull.version>1.8</mimepull.version>
> <findbugs.skip>false</findbugs.skip>
> <findbugs.threshold>High</findbugs.threshold>
> <findbugs.exclude></findbugs.exclude>
> @@ -1092,7 +1092,7 @@
> </dependency>
>
> <dependency>
> - <groupId>org.jvnet</groupId>
> + <groupId>org.jvnet.mimepull</groupId>
> <artifactId>mimepull</artifactId>
> <version>${mimepull.version}</version>
> </dependency>
> Index: nucleus/admin/rest/rest-service/pom.xml
> ===================================================================
> --- nucleus/admin/rest/rest-service/pom.xml (revision 52834)
> +++ nucleus/admin/rest/rest-service/pom.xml (working copy)
> @@ -3,7 +3,7 @@
>
> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
>
> - Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights
> reserved.
> + Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights
> reserved.
>
> The contents of this file are subject to the terms of either the GNU
> General Public License Version 2 only ("GPL") or the Common
> Development
> @@ -97,7 +97,7 @@
> <artifactId>management-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>org.jvnet</groupId>
> + <groupId>org.jvnet.mimepull</groupId>
> <artifactId>mimepull</artifactId>
> <scope>provided</scope>
> </dependency>
> Index: nucleus/packager/nucleus-common/pom.xml
> ===================================================================
> --- nucleus/packager/nucleus-common/pom.xml (revision 52834)
> +++ nucleus/packager/nucleus-common/pom.xml (working copy)
> @@ -139,7 +139,7 @@
>
> <!-- mimepull - shared dependency of metro and jersey -->
> <dependency>
> - <groupId>org.jvnet</groupId>
> + <groupId>org.jvnet.mimepull</groupId>
> <artifactId>mimepull</artifactId>
> </dependency>
>