Author: alessio.soldano(a)jboss.com Date: 2010-05-20 09:08:55 -0400 (Thu, 20 May 2010) New Revision: 12287 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml stack/native/branches/jbossws-native-3.1.2/pom.xml stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: Update / synch libs with EAP 5.1 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-05-20 13:04:52 UTC (rev 12286) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-05-20 13:08:55 UTC (rev 12287) @@ -111,11 +111,11 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> @@ -135,7 +135,7 @@ <artifactId>jettison</artifactId> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> <dependency> @@ -152,7 +152,7 @@ </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> + <artifactId>wstx</artifactId> </dependency> <dependency> <groupId>wsdl4j</groupId> Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-05-20 13:04:52 UTC (rev 12286) +++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-05-20 13:08:55 UTC (rev 12287) @@ -21,13 +21,13 @@ <version>${version}</version> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> - <version>1.0</version> + <version>1.0.1</version> </dependency> </dependencies> Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-20 13:04:52 UTC (rev 12286) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-20 13:08:55 UTC (rev 12287) @@ -59,8 +59,8 @@ <codehaus.jettison.version>1.1</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.9.0.GA</javassist.version> - <jaxb.api.version>2.1.9.patch02</jaxb.api.version> - <jaxb.impl.version>2.1.9.patch02</jaxb.impl.version> + <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.impl.version>2.1.12.patch01</jaxb.impl.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version> <jboss.remoting.version>2.5.2.SP3</jboss.remoting.version> @@ -70,7 +70,7 @@ <juddi.version>2.0.1</juddi.version> <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version> <sun.jaxws.version>2.1.7</sun.jaxws.version> - <woodstox.version>3.2.8</woodstox.version> + <woodstox.version>3.2.9</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xmlsec.version>1.4.3</xmlsec.version> <xalan.version>2.7.1.patch02</xalan.version> @@ -149,7 +149,7 @@ <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> - <version>1.0</version> + <version>1.0.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -214,17 +214,17 @@ </exclusions> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.api.version}</version> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>sun-jaxb</groupId> + <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> <version>${jaxb.impl.version}</version> </dependency> @@ -309,7 +309,7 @@ </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> + <artifactId>wstx</artifactId> <version>${woodstox.version}</version> </dependency> <dependency> Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 13:04:52 UTC (rev 12286) +++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 13:08:55 UTC (rev 12287) @@ -33,9 +33,9 @@ <useStrictFiltering>true</useStrictFiltering> <includes> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> - <include>sun-jaxb:jaxb-api:jar</include> - <include>sun-jaxb:jaxb-impl:jar</include> - <include>sun-jaxb:jaxb-xjc:jar</include> + <include>javax.xml.bind:jaxb-api:jar</include> + <include>com.sun.xml.bind:jaxb-impl:jar</include> + <include>com.sun.xml.bind:jaxb-xjc:jar</include> <include>com.sun.xml.ws:jaxws-tools:jar</include> <include>com.sun.xml.ws:jaxws-rt:jar</include> <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include> @@ -51,15 +51,9 @@ <include>com.sun.xml.stream.buffer:streambuffer:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache:xmlsec:jar</include> + <include>org.codehaus.woodstox:wstx:jar</include> </includes> </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.codehaus.woodstox:wstx-lgpl:jar</include> - </includes> - </dependencySet> </dependencySets> </binaries> </moduleSet>