Author: richard.opalka(a)jboss.com Date: 2010-05-25 04:43:31 -0400 (Tue, 25 May 2010) New Revision: 12317 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2928][JBEE-28][JBEE-30][JBEE-31] use JBoss provided JAXWS, JAXB & SAAJ API libraries Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2010-05-24 13:35:39 UTC (rev 12316) +++ stack/native/trunk/modules/core/pom.xml 2010-05-25 08:43:31 UTC (rev 12317) @@ -39,8 +39,8 @@ <artifactId>jaxrpc-api</artifactId> </dependency> <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> @@ -94,8 +94,8 @@ </dependency> <!-- transitve dependencies --> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> </dependency> <dependency> <groupId>javax.jws</groupId> @@ -130,8 +130,8 @@ <artifactId>jettison</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -186,8 +186,8 @@ <configuration> <artifactItems> <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <type>jar</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/endorsed</outputDirectory> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-05-24 13:35:39 UTC (rev 12316) +++ stack/native/trunk/pom.xml 2010-05-25 08:43:31 UTC (rev 12317) @@ -61,11 +61,11 @@ <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.6.0.GA</javassist.version> - <jaxws.api.version>2.2</jaxws.api.version> + <jaxws.api.version>1.0.0.Beta1</jaxws.api.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> - <saaj.api.version>1.3</saaj.api.version> + <saaj.api.version>1.0.0.Beta1</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <jaxb.api.version>2.2</jaxb.api.version> + <jaxb.api.version>1.0.0.Beta1</jaxb.api.version> <jaxb.impl.version>2.2</jaxb.impl.version> <jboss.logging.version>2.2.0.CR1</jboss.logging.version> <jboss.jaxr.version>2.0.1</jboss.jaxr.version> @@ -293,27 +293,9 @@ <version>${jsr181.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <version>${jaxws.api.version}</version> - <exclusions> - <exclusion> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>javax.xml</groupId> @@ -327,19 +309,13 @@ </exclusions> </dependency> <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> <version>${saaj.api.version}</version> - <exclusions> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> <version>${jaxb.api.version}</version> </dependency> <dependency> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-24 13:35:39 UTC (rev 12316) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 08:43:31 UTC (rev 12317) @@ -43,8 +43,6 @@ <useStrictFiltering>true</useStrictFiltering> <includes> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> - <include>javax.xml.bind:jaxb-api:jar</include> - <include>javax.xml.ws:jaxws-api:jar</include> <include>javax.jws:jsr181-api:jar</include> <include>com.sun.xml.bind:jaxb-impl:jar</include> <include>com.sun.xml.bind:jaxb-xjc:jar</include> @@ -55,7 +53,6 @@ <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>javax.xml:jaxrpc-api:jar</include> - <include>javax.xml.soap:saaj-api:jar</include> <include>org.codehaus.jettison:jettison:jar</include> <include>com.sun.xml.ws:policy:jar</include> <include>stax:stax-api:jar</include> @@ -75,6 +72,27 @@ <include>org.codehaus.woodstox:wstx-lgpl:jar</include> </includes> </dependencySet> + <dependencySet> + <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>saaj-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>