[jboss-cvs] JBossAS SVN: r100375 - branches/JBPAPP_5_0/component-matrix.

[jboss-cvs-commits at lists.jboss.org]

Author: fnasser at redhat.com
Date: 2010-02-03 15:33:18 -0500 (Wed, 03 Feb 2010)
New Revision: 100375

Modified:
   branches/JBPAPP_5_0/component-matrix/pom.xml
Log:
Reinstate fix for JBPTP-88

Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml	2010-02-03 20:15:56 UTC (rev 100374)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml	2010-02-03 20:33:18 UTC (rev 100375)
@@ -38,7 +38,7 @@
     <version.jboss.jbossws-common>1.1.0.SP2</version.jboss.jbossws-common>
     <version.jboss.jbossws-framework>3.1.2.SP4</version.jboss.jbossws-framework>
     <version.jboss.jbossws-spi>1.1.2.SP1</version.jboss.jbossws-spi>
-    <version.jboss.jbossws>3.1.2.SP3-patch-02</version.jboss.jbossws>
+    <version.jboss.jbossws>3.1.2.SP3_CP01</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.6.GA</version.jboss.messaging>
     <version.jboss.web>2.1.7.GA</version.jboss.web>
@@ -104,7 +104,7 @@
     <version.streambuffer>2.1.3</version.streambuffer>
     <version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
     <version.sun-jaxws>2.1.3</version.sun-jaxws>
-    <version.sun.jaxb>2.1.9.patch01</version.sun.jaxb>
+    <version.sun.jaxb>2.1.9.patch02</version.sun.jaxb>
     <version.xdoclet>1.2.3</version.xdoclet>
   </properties>
 
@@ -1759,6 +1759,10 @@
             <groupId>org.jboss.ejb3</groupId>
             <artifactId>jboss-ejb3-metrics-deployer</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>sun-jaxws</groupId>
+            <artifactId>jaxws-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       
@@ -1825,6 +1829,10 @@
             <groupId>org.jboss.ejb3</groupId>
             <artifactId>jboss-ejb3-transactions</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>sun-jaxws</groupId>
+            <artifactId>jaxws-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       
@@ -2182,12 +2190,24 @@
         <groupId>sun-jaxws</groupId>
         <artifactId>stax-ex</artifactId>
         <version>${version.staxex}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>sun-jaxws</groupId>
         <artifactId>streambuffer</artifactId>
         <version>${version.streambuffer}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jvnet.staxex</groupId>
+            <artifactId>stax-ex</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>    
       
       <dependency>