diff -Nru glassfish-jaxws-2.2.7/etc/poms/jaxws-ri.pom glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-ri.pom --- glassfish-jaxws-2.2.7/etc/poms/jaxws-ri.pom 2011-10-24 17:32:12.000000000 +0200 +++ glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-ri.pom 2012-10-29 10:45:25.264955097 +0100 @@ -117,15 +117,8 @@ <dependencies> <dependency> <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-osgi</artifactId> - <type>pom</type> - <scope>import</scope> - <version>@JAXB_VERSION@</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-osgi</artifactId> - <version>@JAXB_VERSION@</version> + <artifactId>jaxb-impl</artifactId> + <version>2.2.6</version> </dependency> </dependencies> </dependencyManagement> diff -Nru glassfish-jaxws-2.2.7/etc/poms/jaxws-rt.pom glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-rt.pom --- glassfish-jaxws-2.2.7/etc/poms/jaxws-rt.pom 2011-10-25 18:45:53.000000000 +0200 +++ glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-rt.pom 2012-10-29 10:50:13.709651978 +0100 @@ -137,107 +137,107 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>@API_VERSION@</version> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>2.0.2.Final-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.annotation</artifactId> - <version>@JSR_250_API_VERSION@</version> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.1_spec</artifactId> + <version>1.0.1-SNAPSHOT</version> </dependency> - <dependency> + <!--dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>@JSR_181_API_VERSION@</version> - </dependency> + </dependency--> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>@JAXB_VERSION@</version> + <version>2.2.6</version> </dependency> - <dependency> + <!--dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <type>pom</type> <scope>import</scope> <version>@JAXB_VERSION@</version> - </dependency> + </dependency--> <dependency> <groupId>com.sun.xml.messaging.saaj</groupId> <artifactId>saaj-impl</artifactId> - <version>@SAAJ_VERSION@</version> + <version>1.3.19</version> </dependency> - <dependency> + <!--dependency> <groupId>com.sun.xml.messaging.saaj</groupId> <artifactId>saaj-impl</artifactId> <version>@SAAJ_VERSION@</version> <type>pom</type> <scope>import</scope> - </dependency> + </dependency--> <dependency> <groupId>com.sun.xml.stream.buffer</groupId> <artifactId>streambuffer</artifactId> - <version>@XMLSTREAMBUFFER_VERSION@</version> + <version>1.5</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> - <version>@WOODSTOX_CORE_VERSION@</version> + <version>4.1.2</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>@STAX2_API_VERSION@</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>org.jvnet.mimepull</groupId> <artifactId>mimepull</artifactId> - <version>@MIMEPULL_VERSION@</version> + <version>1.8</version> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>policy</artifactId> - <version>@POLICY_VERSION@</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.jvnet.staxex</groupId> <artifactId>stax-ex</artifactId> - <version>@STAX_EX_VERSION@</version> + <version>1.7</version> </dependency> </dependencies> </dependencyManagement> <dependencies> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>@API_VERSION@</version> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>2.0.2.Final-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>@JAXB_VERSION@</version> + <version>2.2.6</version> </dependency> <dependency> <groupId>com.sun.xml.messaging.saaj</groupId> <artifactId>saaj-impl</artifactId> - <version>@SAAJ_VERSION@</version> + <version>1.3.19</version> </dependency> <dependency> <groupId>com.sun.xml.stream.buffer</groupId> <artifactId>streambuffer</artifactId> - <version>@XMLSTREAMBUFFER_VERSION@</version> + <version>1.5</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> - <version>@WOODSTOX_CORE_VERSION@</version> + <version>4.1.2</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>@STAX2_API_VERSION@</version> + <version>3.1.1</version> </dependency> <!-- If you want to use SJSXP StAX parser, uncomment this and comment woodstox one <dependency> @@ -249,27 +249,47 @@ <dependency> <groupId>org.jvnet.mimepull</groupId> <artifactId>mimepull</artifactId> - <version>@MIMEPULL_VERSION@</version> + <version>1.8</version> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>policy</artifactId> - <version>@POLICY_VERSION@</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.jvnet.staxex</groupId> <artifactId>stax-ex</artifactId> - <version>@STAX_EX_VERSION@</version> + <version>1.7</version> </dependency> <dependency> <groupId>org.glassfish.gmbal</groupId> <artifactId>gmbal-api-only</artifactId> - <version>@GMBAL_API_VERSION@</version> + <version>3.1.0-b001</version> </dependency> <dependency> <groupId>org.glassfish.ha</groupId> <artifactId>ha-api</artifactId> - <version>@HA_API_VERSION@</version> + <version>3.1.8</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>2.2.6</version> + </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.glassfish.pfl</groupId> + <artifactId>pfl-tf</artifactId> + <version>3.2.0-b001</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>3.3.1</version> </dependency> </dependencies> diff -Nru glassfish-jaxws-2.2.7/etc/poms/jaxws-tools.pom glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-tools.pom --- glassfish-jaxws-2.2.7/etc/poms/jaxws-tools.pom 2012-04-27 13:32:03.000000000 +0200 +++ glassfish-jaxws-2.2.7-gil/etc/poms/jaxws-tools.pom 2012-10-29 10:51:24.728398709 +0100 @@ -118,20 +118,20 @@ <dependency> <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> - <version>@VERSION@</version> + <version>2.2.7</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>@JAXB_VERSION@</version> + <version>2.2.6</version> </dependency> - <dependency> + <!--dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>@JAXB_VERSION@</version> + <version>2.2.6</version> <type>pom</type> <scope>import</scope> - </dependency> + </dependency--> </dependencies> </dependencyManagement> @@ -144,7 +144,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>@JAXB_VERSION@</version> + <version>2.2.6</version> </dependency> </dependencies>