You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/09 23:48:49 UTC
svn commit: r593679 - in /incubator/cxf/branches/2.0.x-fixes: ./
common/common/pom.xml distribution/manifest/pom.xml distribution/pom.xml
parent/pom.xml rt/frontend/js/pom.xml systests/pom.xml
tools/validator/pom.xml
Author: dkulp
Date: Fri Nov 9 14:48:45 2007
New Revision: 593679
URL: http://svn.apache.org/viewvc?rev=593679&view=rev
Log:
Merged revisions 592822 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r592822 | dkulp | 2007-11-07 12:36:29 -0500 (Wed, 07 Nov 2007) | 2 lines
Change to using geronimo-specs version of stax-api which doesn't have the QName class that causes classloader issues
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml
incubator/cxf/branches/2.0.x-fixes/systests/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml Fri Nov 9 14:48:45 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/branches/2.0.x-fixes/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml Fri Nov 9 14:48:45 2007
@@ -215,7 +215,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml Fri Nov 9 14:48:45 2007
@@ -221,7 +221,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Fri Nov 9 14:48:45 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/branches/2.0.x-fixes/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml Fri Nov 9 14:48:45 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/branches/2.0.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/pom.xml Fri Nov 9 14:48:45 2007
@@ -403,7 +403,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml?rev=593679&r1=593678&r2=593679&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml Fri Nov 9 14:48:45 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>