Author: dkulp Date: Mon Mar 25 18:43:29 2013 New Revision: 1460830 URL: http://svn.apache.org/r1460830 Log: Merged revisions 1460814 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1460814 | dkulp | 2013-03-25 14:31:14 -0400 (Mon, 25 Mar 2013) | 18 lines Merged revisions 1460786 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1460786 | dkulp | 2013-03-25 13:56:17 -0400 (Mon, 25 Mar 2013) | 10 lines Merged revisions 1460428 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1460428 | dkulp | 2013-03-24 15:58:48 -0400 (Sun, 24 Mar 2013) | 2 lines Update to latest woodstox ........ ........ ........ 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=1460830&r1=1460829&r2=1460830&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:29 2013 @@ -91,10 +91,8 @@ <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version> <cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> - <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId> - <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId> - <cxf.woodstox.core.version>4.1.4</cxf.woodstox.core.version> - <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version> + <cxf.velocity.version>1.7</cxf.velocity.version> + <cxf.woodstox.core.version>4.2.0</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> <cxf.wss4j.version>1.6.10</cxf.wss4j.version>
