Author: fnasser(a)redhat.com Date: 2009-11-23 14:47:05 -0500 (Mon, 23 Nov 2009) New Revision: 11144 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: Align dependencies and versions of dependencies with the ones used in the EAP 5.0.0.GA (partial) Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-11-23 11:22:01 UTC (rev 11143) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-11-23 19:47:05 UTC (rev 11144) @@ -28,10 +28,6 @@ <!-- CXF dependencies --> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-anttasks</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> </dependency> <dependency> @@ -150,6 +146,14 @@ <artifactId>jboss-common-core</artifactId> </dependency> <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </dependency> + <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> </dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-11-23 11:22:01 UTC (rev 11143) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-11-23 19:47:05 UTC (rev 11144) @@ -28,10 +28,6 @@ <!-- CXF dependencies --> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-anttasks</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> </dependency> <dependency> @@ -144,6 +140,14 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </dependency> <!-- transitve dependencies --> <dependency> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-11-23 11:22:01 UTC (rev 11143) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/pom.xml 2009-11-23 19:47:05 UTC (rev 11144) @@ -46,8 +46,8 @@ <artifactId>jbossws-framework</artifactId> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> </dependency> <dependency> <groupId>javax.jws</groupId> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-11-23 11:22:01 UTC (rev 11143) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-11-23 19:47:05 UTC (rev 11144) @@ -53,18 +53,17 @@ --> <!-- END --> <cxf.version>2.2.2</cxf.version> - <cxf.anttasks.version>2.1.5</cxf.anttasks.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>2.2.3</cxf.asm.version> - <fastinfoset.api.version>1.2.6</fastinfoset.api.version> - <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> - <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.9</jaxb.impl.version> + <fastinfoset.api.version>1.2.7</fastinfoset.api.version> + <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> + <jaxb.api.version>2.1.9.patch01</jaxb.api.version> + <jaxb.impl.version>2.1.9.patch01</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> - <jaxws.api.version>2.1-1</jaxws.api.version> - <juddi.version>0.9RC4</juddi.version> + <jaxws.api.version>2.1.3</jaxws.api.version> + <juddi.version>2.0.1</juddi.version> <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> - <apache.scout.version>0.7rc2</apache.scout.version> + <apache.scout.version>1.1.1</apache.scout.version> <commons-collections.version>3.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -121,9 +120,9 @@ <!-- provided apis --> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - <version>3.0</version> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + <version>3.0.0.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -148,11 +147,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> @@ -163,21 +182,53 @@ <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> + </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> + </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-jaxws_2.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -193,6 +244,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> @@ -203,21 +264,49 @@ <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> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -330,6 +419,28 @@ <artifactId>juddi-service</artifactId> <version>${jboss.jaxr.version}</version> <type>sar</type> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-system-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-j2se</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-microcontainer</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>apache-scout</groupId> @@ -346,6 +457,22 @@ <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + <version>1.1.0.GA</version> + </dependency> + <!-- we just want javax.annotation 1.0 but it is in the ejb3 API JAR --> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <version>3.0.0.GA</version> + </dependency> </dependencies> </dependencyManagement> @@ -410,6 +537,13 @@ <!-- Repositories --> <repositories> <repository> + <id>prod-repository.jboss.org</id> + <url>http://repository.jboss.org/maven2-brew</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> <id>repository.jboss.org</id> <url>http://repository.jboss.org/maven2</url> <snapshots> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-11-23 11:22:01 UTC (rev 11143) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-11-23 19:47:05 UTC (rev 11144) @@ -23,7 +23,7 @@ <useStrictFiltering>true</useStrictFiltering> <includes> <include>org.apache.cxf:cxf-*</include> - <include>org.apache.geronimo.specs:geronimo-javamail*</include> + <include>javax.mail:mail*</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> @@ -54,7 +54,7 @@ <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>org.apache.geronimo.specs:geronimo-jaxws_2.1_spec:jar</include> + <include>javax.xml.ws:jaxws-api:jar</include> </includes> </dependencySet> <dependencySet>