Author: coheigea Date: Mon Mar 25 16:28:11 2013 New Revision: 1460752 URL: http://svn.apache.org/r1460752 Log: Merged revisions 1460745 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1460745 | coheigea | 2013-03-25 16:23:37 +0000 (Mon, 25 Mar 2013) | 18 lines Merged revisions 1460737 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1460737 | coheigea | 2013-03-25 15:57:51 +0000 (Mon, 25 Mar 2013) | 10 lines Merged revisions 1460736 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1460736 | coheigea | 2013-03-25 15:56:28 +0000 (Mon, 25 Mar 2013) | 2 lines Upgrading to WSS4J 1.6.10 ........ ........ ........ 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=1460752&r1=1460751&r2=1460752&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.5.x-fixes/parent/pom.xml Mon Mar 25 16:28:11 2013 @@ -97,8 +97,13 @@ <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version> <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> +<<<<<<< HEAD <cxf.wss4j.version>1.6.10-SNAPSHOT</cxf.wss4j.version> <cxf.xmlbeans.version>2.5.0</cxf.xmlbeans.version> +======= + <cxf.wss4j.version>1.6.10</cxf.wss4j.version> + <cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version> +>>>>>>> b2748d1... Merged revisions 1460736 via git cherry-pick from <cxf.xmlschema.version>2.0.3</cxf.xmlschema.version> <cxf.jibx.version>1.2.4.5</cxf.jibx.version> <cxf.axiom.version>1.2.10</cxf.axiom.version>
