Author: alessio.soldano(a)jboss.com Date: 2010-05-21 14:15:20 -0400 (Fri, 21 May 2010) New Revision: 12311 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3036] artifact dependencies cleanup Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/client/pom.xml 2010-05-21 18:15:20 UTC (rev 12311) @@ -141,8 +141,8 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> </dependency> <dependency> <groupId>org.apache.santuario</groupId> @@ -170,6 +170,11 @@ <artifactId>jaxrpc-api</artifactId> </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <!-- jboss provided --> <dependency> <groupId>org.jboss</groupId> Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-21 18:15:20 UTC (rev 12311) @@ -43,6 +43,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar rem stack specific libs set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar @@ -72,7 +73,6 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-21 18:15:20 UTC (rev 12311) @@ -82,6 +82,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jsr181-api.jar" # Stack specific dependencies WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar" @@ -111,7 +112,6 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-21 18:15:20 UTC (rev 12311) @@ -40,6 +40,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar rem stack specific libs set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar @@ -71,7 +72,6 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-05-21 18:15:20 UTC (rev 12311) @@ -82,6 +82,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" # stack specific dependencies WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar" @@ -113,7 +114,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-05-21 18:15:20 UTC (rev 12311) @@ -60,6 +60,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar rem stack specific libs set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/asm.jar @@ -92,7 +93,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-05-21 18:15:20 UTC (rev 12311) @@ -80,6 +80,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar" # stack specific dependencies WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/asm.jar" @@ -112,7 +113,6 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-lang.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/geronimo-ws-metadata_2.0_spec.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar" Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-21 18:15:20 UTC (rev 12311) @@ -29,13 +29,12 @@ <include name="**/commons-collections.jar"/> <include name="**/commons-lang.jar"/> <include name="**/cxf-*.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> + <include name="**/jsr181-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-framework.jar"/> @@ -57,6 +56,7 @@ <include name="**/wstx.jar"/> <include name="**/XmlSchema.jar"/> <include name="**/FastInfoset.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -75,11 +75,9 @@ <include name="**/commons-beanutils.jar"/> <include name="**/cxf-*.jar"/> <include name="**/FastInfoset.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jsr181-api.jar"/> <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/modules/server/pom.xml 2010-05-21 18:15:20 UTC (rev 12311) @@ -141,8 +141,8 @@ <artifactId>jaxrpc-api</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> </dependency> <dependency> <groupId>org.apache.santuario</groupId> @@ -165,6 +165,10 @@ <artifactId>spring-tx</artifactId> </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> <!-- jboss provided --> <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/pom.xml 2010-05-21 18:15:20 UTC (rev 12311) @@ -68,6 +68,7 @@ <jaxrpc.api.version>1.1</jaxrpc.api.version> <jaxws.api.version>2.1-1</jaxws.api.version> <jboss.jaxr.version>2.0.1</jboss.jaxr.version> + <jsr181.api.version>1.0-MR1</jsr181.api.version> <apache.scout.version>1.1.1</apache.scout.version> <juddi.version>0.9RC4</juddi.version> <commons-collections.version>3.1</commons-collections.version> @@ -171,12 +172,6 @@ <version>3.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - <scope>provided</scope> - </dependency> <!-- CXF dependencies --> <dependency> @@ -188,11 +183,31 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-http</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -203,16 +218,67 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-coloc</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-corba</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + <!-- Specify the Spring bits we need at the version we need later --> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -239,6 +305,16 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-jms</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -249,21 +325,53 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-java2ws</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-wsdlto-core</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -337,8 +445,8 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> <version>${cxf.stax.version}</version> </dependency> <dependency> @@ -356,18 +464,21 @@ <artifactId>asm</artifactId> <version>${cxf.asm.version}</version> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring.version}</version> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>${jsr181.api.version}</version> + </dependency> <!-- jboss provided --> <dependency> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-21 16:22:54 UTC (rev 12310) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-21 18:15:20 UTC (rev 12311) @@ -24,8 +24,6 @@ <includes> <include>org.apache.cxf:cxf-*</include> <include>org.apache.cxf.xjcplugins:cxf-*</include> - <include>org.apache.geronimo.specs:geronimo-javamail*</include> - <include>org.apache.geronimo.specs:geronimo-ws-metadata*</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> @@ -53,23 +51,12 @@ <include>commons-lang:commons-lang:jar</include> <include>jboss.jaxbintros:jboss-jaxb-intros</include> <include>org.mortbay.jetty:jetty*</include> + <include>stax:stax-api:jar</include> + <include>javax.xml.ws:jaxws-api:jar</include> + <include>javax.jws:jsr181-api:jar</include> </includes> </dependencySet> <dependencySet> - <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.apache.geronimo.specs:geronimo-jaxws_2.1_spec:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>stax-api.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include> - </includes> - </dependencySet> - <dependencySet> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes>