[jboss-cvs] JBossAS SVN: r105075 - in branches/JBPAPP_5_0: thirdparty and 1 other directory.

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

Author: fnasser at redhat.com
Date: 2010-05-20 15:34:59 -0400 (Thu, 20 May 2010)
New Revision: 105075

Modified:
   branches/JBPAPP_5_0/component-matrix/pom.xml
   branches/JBPAPP_5_0/thirdparty/pom.xml
Log:
JBPAPP-4251 - Upgrade JAXB to 2.1.12

Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml	2010-05-20 19:19:40 UTC (rev 105074)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml	2010-05-20 19:34:59 UTC (rev 105075)
@@ -104,7 +104,8 @@
     <version.streambuffer>2.1.3</version.streambuffer>
     <version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
     <version.sun-jaxws>2.1.7</version.sun-jaxws>
-    <version.sun.jaxb>2.1.9.patch02</version.sun.jaxb>
+    <version.sun.jaxb>2.1.12.patch01</version.sun.jaxb>
+    <version.sun.jaxb.api>2.1</version.sun.jaxb.api>
     <version.xdoclet>1.2.3</version.xdoclet>
   </properties>
 
@@ -451,19 +452,25 @@
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxb</groupId>
+        <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
-        <version>${version.sun.jaxb}</version>
+        <version>${version.sun.jaxb.api}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxb</groupId>
+        <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
       
       <dependency>
-        <groupId>sun-jaxb</groupId>
+        <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-xjc</artifactId>
         <version>${version.sun.jaxb}</version>
       </dependency>
@@ -803,6 +810,18 @@
             <artifactId>stax-api</artifactId>
           </exclusion>
           <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-impl</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
           </exclusion>
@@ -837,6 +856,10 @@
         <version>${version.jboss.jbossws}</version>
         <exclusions>
           <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
           </exclusion>
@@ -1331,6 +1354,10 @@
         <version>${version.org.jboss.metadata}</version>
         <exclusions>
           <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-jaxws</artifactId>
           </exclusion>
@@ -1591,6 +1618,10 @@
         <version>${version.org.jboss.cluster.cache.spi}</version>
         <exclusions>
           <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>org.jboss.naming</groupId>
             <artifactId>jnp-client</artifactId>            
           </exclusion>
@@ -1959,6 +1990,12 @@
         <groupId>org.jboss.man</groupId>
         <artifactId>jboss-managed</artifactId>
         <version>${version.org.jboss.man}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>sun-jaxb</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
@@ -2343,8 +2380,9 @@
                         <exclude>bsh:bsh</exclude>
                         <exclude>javax.security:jaas</exclude>
                         <exclude>javax.xml.stream:stax-api</exclude>
-                        <exclude>com.sun.xml.bind:jaxb-impl</exclude>
-                        <exclude>javax.xml.bind:jaxb-api</exclude>
+                        <exclude>sun-jaxb:jaxb-impl</exclude>
+                        <exclude>sun-jaxb:jaxb-xjc</exclude>
+                        <exclude>sun-jaxb:jaxb-api</exclude>
                         <exclude>com.sun.xml.ws:jaxws-tools</exclude>
                         <exclude>apache-xerces:xercesImpl</exclude>
                         <exclude>ant:ant</exclude>

Modified: branches/JBPAPP_5_0/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0/thirdparty/pom.xml	2010-05-20 19:19:40 UTC (rev 105074)
+++ branches/JBPAPP_5_0/thirdparty/pom.xml	2010-05-20 19:34:59 UTC (rev 105075)
@@ -175,6 +175,13 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+              <mapping>
+                <componentId>sun-jaxb</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
               <groupId>jfree</groupId>
               <artifactId>jfreechart</artifactId>
               <mapping>
@@ -1913,15 +1920,15 @@
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
     <dependency>