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

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

Author: dwalluck at redhat.com
Date: 2010-01-29 10:51:31 -0500 (Fri, 29 Jan 2010)
New Revision: 100128

Modified:
   branches/JBPAPP_5_0/component-matrix/pom.xml
Log:
- [JBPAPP-3389], [JBPAPP-2114], [JBPAPP-2121]: Upgrade sun-jaxb from 2.1.9.patch01 to 2.1.9.patch02
- [JBPAPP-2159]: Upgrade JBossWS from 3.1.2.SP3-patch-02 to 3.1.2.SP3_CP01
- [JBPTP-88]: Add exclusion to org.jboss.ejb3:jboss-ejb3-core:jar for sun-jaxws:jaxws-api:2.1.1 (have 2.1.3)
- [JBPTP-88]: Add exclusion to org.jboss.ejb3:jboss-ejb3-core:jar:client for sun-jaxws:jaxws-api:2.1.1 (have 2.1.3)
- [JBPTP-88]: Add exclusion to sun-jaxws:stax-ex for javax.xml.stream:stax-api (have stax:stax-api)
- [JBPTP-88]: Add exclusion to sun:jaxws:streambuffer for javax.xml.stream:stax-api (have stax:stax-api)


Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml	2010-01-29 15:42:21 UTC (rev 100127)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml	2010-01-29 15:51:31 UTC (rev 100128)
@@ -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>
@@ -103,7 +103,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>
 
@@ -1752,6 +1752,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>
       
@@ -1818,6 +1822,10 @@
             <groupId>org.jboss.ejb3</groupId>
             <artifactId>jboss-ejb3-transactions</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>sun-jaxws</groupId>
+            <artifactId>jaxws-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       
@@ -2175,12 +2183,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>