Author: dkulp Date: Mon Mar 25 18:31:35 2013 New Revision: 1460819 URL: http://svn.apache.org/r1460819 Log: Merged revisions 1460791 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1460791 | dkulp | 2013-03-25 13:56:37 -0400 (Mon, 25 Mar 2013) | 10 lines Merged revisions 1460775 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1460775 | dkulp | 2013-03-25 13:34:38 -0400 (Mon, 25 Mar 2013) | 2 lines Cleanup stax dependencies that are no longer needed. ........ ........ Modified: cxf/branches/2.6.x-fixes/parent/pom.xml cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml cxf/branches/2.6.x-fixes/rt/databinding/sdo/pom.xml cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml cxf/branches/2.6.x-fixes/tools/corba/pom.xml Modified: cxf/branches/2.6.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1460819&r1=1460818&r2=1460819&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Mar 25 18:31:35 2013 @@ -1565,27 +1565,6 @@ </properties> </profile> <profile> - <!-- sjsxp is really the precursor to the jaxp-ri jars. However, getting the jaxp-ri jar to work on - Java 5 requires endorsing it which is non-trivial in maven :-(. - --> - <id>sjsxp</id> - <properties> - <cxf.stax.impl.groupId>com.sun.xml.stream</cxf.stax.impl.groupId> - <cxf.stax.impl.artifactId>sjsxp</cxf.stax.impl.artifactId> - <cxf.stax.impl.version>1.0.1</cxf.stax.impl.version> - </properties> - </profile> - <profile> - <!-- This really only works with Java 6 as the classes are identically named with the same classes in the Java 5 JDK - and the Java 5 versions get picked up instead --> - <id>jaxpri</id> - <properties> - <cxf.stax.impl.groupId>com.sun.xml.parsers</cxf.stax.impl.groupId> - <cxf.stax.impl.artifactId>jaxp-ri</cxf.stax.impl.artifactId> - <cxf.stax.impl.version>1.4.2</cxf.stax.impl.version> - </properties> - </profile> - <profile> <id>axis2-saaj</id> <properties> <cxf.saaj.impl.groupId>org.apache.axis2</cxf.saaj.impl.groupId> Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml?rev=1460819&r1=1460818&r2=1460819&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml Mon Mar 25 18:31:35 2013 @@ -145,12 +145,6 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </dependency> - - <dependency> - <groupId>${cxf.stax.impl.groupId}</groupId> - <artifactId>${cxf.stax.impl.artifactId}</artifactId> - </dependency> - </dependencies> </profile> </profiles> Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/pom.xml?rev=1460819&r1=1460818&r2=1460819&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/sdo/pom.xml (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/pom.xml Mon Mar 25 18:31:35 2013 @@ -68,10 +68,6 @@ <artifactId>cxf-rt-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${cxf.stax.impl.groupId}</groupId> - <artifactId>${cxf.stax.impl.artifactId}</artifactId> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> Modified: cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1460819&r1=1460818&r2=1460819&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml (original) +++ cxf/branches/2.6.x-fixes/rt/databinding/xmlbeans/pom.xml Mon Mar 25 18:31:35 2013 @@ -193,10 +193,6 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> </dependency> - <dependency> - <groupId>${cxf.stax.impl.groupId}</groupId> - <artifactId>${cxf.stax.impl.artifactId}</artifactId> - </dependency> </dependencies> </profile> <profile> Modified: cxf/branches/2.6.x-fixes/tools/corba/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/pom.xml?rev=1460819&r1=1460818&r2=1460819&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/tools/corba/pom.xml (original) +++ cxf/branches/2.6.x-fixes/tools/corba/pom.xml Mon Mar 25 18:31:35 2013 @@ -69,10 +69,6 @@ <artifactId>xmlschema-core</artifactId> </dependency> <dependency> - <groupId>${cxf.stax.impl.groupId}</groupId> - <artifactId>${cxf.stax.impl.artifactId}</artifactId> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency>
