cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r592822 - in /incubator/cxf/trunk: common/common/pom.xml distribution/manifest/pom.xml distribution/pom.xml parent/pom.xml rt/frontend/jaxrs/pom.xml rt/frontend/js/pom.xml systests/pom.xml tools/validator/pom.xml
Date Wed, 07 Nov 2007 17:36:34 GMT
Author: dkulp
Date: Wed Nov  7 09:36:29 2007
New Revision: 592822

URL: http://svn.apache.org/viewvc?rev=592822&view=rev
Log:
Change to using geronimo-specs version of stax-api which doesn't have the QName class that
causes classloader issues

Modified:
    incubator/cxf/trunk/common/common/pom.xml
    incubator/cxf/trunk/distribution/manifest/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
    incubator/cxf/trunk/rt/frontend/js/pom.xml
    incubator/cxf/trunk/systests/pom.xml
    incubator/cxf/trunk/tools/validator/pom.xml

Modified: incubator/cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Wed Nov  7 09:36:29 2007
@@ -89,8 +89,8 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>

Modified: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (original)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Wed Nov  7 09:36:29 2007
@@ -223,7 +223,6 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.0-RC2</version>
         </dependency>
         <dependency>
             <groupId>asm</groupId>

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Wed Nov  7 09:36:29 2007
@@ -228,7 +228,6 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.0-RC2</version>
         </dependency>
         <dependency>
             <groupId>asm</groupId>

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Wed Nov  7 09:36:29 2007
@@ -410,14 +410,32 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                <version>1.0</version>
             </dependency>
             <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>1.0-RC2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
@@ -636,6 +654,10 @@
                     <exclusion>
                         <groupId>javax.xml.soap</groupId>
                         <artifactId>saaj-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>

Modified: incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml Wed Nov  7 09:36:29 2007
@@ -75,7 +75,6 @@
        <dependency>
 	            <groupId>org.codehaus.jettison</groupId>
 	            <artifactId>jettison</artifactId>
-	            <version>1.0-RC2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/js/pom.xml Wed Nov  7 09:36:29 2007
@@ -46,8 +46,8 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Wed Nov  7 09:36:29 2007
@@ -410,7 +410,6 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.0-RC2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: incubator/cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/pom.xml?rev=592822&r1=592821&r2=592822&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/validator/pom.xml (original)
+++ incubator/cxf/trunk/tools/validator/pom.xml Wed Nov  7 09:36:29 2007
@@ -96,8 +96,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
 
 	<dependency>



Mime
View raw message