Author: alessio.soldano(a)jboss.com Date: 2010-01-14 04:27:05 -0500 (Thu, 14 Jan 2010) New Revision: 11415 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/modules/testsuite/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: [JBPAPP-3017] Merging jbossws-native-3.1.2.SP3-patch02 changes + fixing the build 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-01-14 06:40:00 UTC (rev 11414) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-01-14 09:27:05 UTC (rev 11415) @@ -47,13 +47,15 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + <version>3.0.0.GA</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + <version>1.1.0.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -93,7 +95,7 @@ <version>1.0.0.SP2</version> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>apache-xalan</groupId> <artifactId>xalan</artifactId> <scope>provided</scope> </dependency> @@ -109,11 +111,11 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-impl</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> @@ -133,7 +135,7 @@ <artifactId>jettison</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> </dependency> <dependency> 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-01-14 06:40:00 UTC (rev 11414) +++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-01-14 09:27:05 UTC (rev 11415) @@ -21,9 +21,14 @@ <version>${version}</version> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> </dependencies> </project> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-01-14 06:40:00 UTC (rev 11414) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-01-14 09:27:05 UTC (rev 11415) @@ -24,7 +24,7 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> - <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> + <jboss.javaee.version>5.0.1.GA</jboss.javaee.version> </properties> <!-- Modules --> @@ -95,6 +95,12 @@ <version>${jboss.jaxr.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>${jboss.javaee.version}</version> + <scope>test</scope> + </dependency> </dependencies> <!-- Build --> Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-01-14 06:40:00 UTC (rev 11414) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-01-14 09:27:05 UTC (rev 11415) @@ -56,25 +56,25 @@ <jbossws.jboss510.version>3.1.2-SNAPSHOT</jbossws.jboss510.version> --> <!-- END --> - <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> + <codehaus.jettison.version>1.1</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> - <javassist.version>3.6.0.GA</javassist.version> - <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.9</jaxb.impl.version> + <javassist.version>3.9.0.GA</javassist.version> + <jaxb.api.version>2.1.9.patch01</jaxb.api.version> + <jaxb.impl.version>2.1.9.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.logging.version>2.0.5.GA</jboss.logging.version> <jboss.remoting.version>2.5.2</jboss.remoting.version> - <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> - <apache.scout.version>0.7rc2</apache.scout.version> - <juddi.version>0.9RC4</juddi.version> - <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> + <jboss.logging.version>2.1.0.GA</jboss.logging.version> + <jboss.jaxr.version>2.0.1</jboss.jaxr.version> + <apache.scout.version>1.1.1</apache.scout.version> + <juddi.version>2.0.1</juddi.version> + <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> - <woodstox.version>3.2.6</woodstox.version> - <wsdl4j.version>1.6.1</wsdl4j.version> + <woodstox.version>3.2.8</woodstox.version> + <wsdl4j.version>1.6.2</wsdl4j.version> <xmlsec.version>1.4.3</xmlsec.version> - <xalan.version>2.7.0</xalan.version> - <xerces.version>2.8.1</xerces.version> + <xalan.version>2.7.1.patch02</xalan.version> + <xerces.version>2.9.1</xerces.version> </properties> <!-- DependencyManagement --> @@ -147,6 +147,11 @@ <version>1.4</version> </dependency> <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -209,17 +214,17 @@ </exclusions> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> + <groupId>sun-jaxb</groupId> <artifactId>jaxb-xjc</artifactId> <version>${jaxb.impl.version}</version> </dependency> @@ -233,6 +238,54 @@ <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-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-j2se</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-microcontainer</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxrpc</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-saaj</artifactId> + </exclusion> + <!-- + <exclusion> + <groupId>apache-scout</groupId> + <artifactId>scout</artifactId> + </exclusion> + <exclusion> + <groupId>juddi</groupId> + <artifactId>juddi</artifactId> + </exclusion> + --> + </exclusions> </dependency> <dependency> <groupId>apache-scout</groupId> @@ -265,7 +318,7 @@ <version>${wsdl4j.version}</version> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>apache-xalan</groupId> <artifactId>xalan</artifactId> <version>${xalan.version}</version> </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-01-14 06:40:00 UTC (rev 11414) +++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-01-14 09:27:05 UTC (rev 11415) @@ -33,9 +33,9 @@ <useStrictFiltering>true</useStrictFiltering> <includes> <include>com.sun.xml.fastinfoset:FastInfoset: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>sun-jaxb:jaxb-api:jar</include> + <include>sun-jaxb:jaxb-impl:jar</include> + <include>sun-jaxb: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>