Author: dkulp Date: Sun Aug 12 14:29:13 2012 New Revision: 1372112 URL: http://svn.apache.org/viewvc?rev=1372112&view=rev Log: Merged revisions 1372105 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1372105 | dkulp | 2012-08-12 10:27:02 -0400 (Sun, 12 Aug 2012) | 18 lines Merged revisions 1372095 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1372095 | dkulp | 2012-08-12 10:10:51 -0400 (Sun, 12 Aug 2012) | 10 lines Merged revisions 1371788 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1371788 | dkulp | 2012-08-10 13:45:38 -0400 (Fri, 10 Aug 2012) | 2 lines Update to latest xmlschema ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/parent/pom.xml Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1372112&r1=1372111&r2=1372112&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Sun Aug 12 14:29:13 2012 @@ -93,8 +93,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.2</cxf.wsdl4j.version> +<<<<<<< HEAD <cxf.xmlbeans.version>2.4.0</cxf.xmlbeans.version> <cxf.xmlschema.version>2.0.2</cxf.xmlschema.version> +======= + <cxf.xmlbeans.version>2.5.0</cxf.xmlbeans.version> + <cxf.xmlschema.version>2.0.3</cxf.xmlschema.version> +>>>>>>> 77a24d7... Merged revisions 1372095 via git cherry-pick from <cxf.jibx.version>1.2.4.5</cxf.jibx.version> <cxf.axiom.version>1.2.10</cxf.axiom.version> <cxf.jettison.version>1.3.2</cxf.jettison.version>
