Author: dkulp Date: Mon Mar 25 18:43:53 2013 New Revision: 1460834 URL: http://svn.apache.org/r1460834 Log: Merged revisions 1460818 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1460818 | dkulp | 2013-03-25 14:31:31 -0400 (Mon, 25 Mar 2013) | 18 lines Merged revisions 1460790 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1460790 | dkulp | 2013-03-25 13:56:33 -0400 (Mon, 25 Mar 2013) | 10 lines Merged revisions 1460773 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1460773 | dkulp | 2013-03-25 13:34:31 -0400 (Mon, 25 Mar 2013) | 2 lines Woodstox is now a compile time dependency. ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/parent/pom.xml Modified: cxf/branches/2.5.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1460834&r1=1460833&r2=1460834&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.5.x-fixes/parent/pom.xml Mon Mar 25 18:43:53 2013 @@ -614,23 +614,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>${cxf.stax.impl.groupId}</groupId> - <artifactId>${cxf.stax.impl.artifactId}</artifactId> - <version>${cxf.stax.impl.version}</version> - <!-- these are motivated by Woodstox, but they can't hurt with others. --> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <!-- this one comes from sjsxp --> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -1407,6 +1390,17 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> <version>${cxf.woodstox.core.version}</version> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <!-- this one comes from sjsxp --> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.java.dev.msv</groupId>
