cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1460753 - /cxf/branches/2.5.x-fixes/parent/pom.xml
Date Mon, 25 Mar 2013 16:28:16 GMT
Author: coheigea
Date: Mon Mar 25 16:28:15 2013
New Revision: 1460753

URL: http://svn.apache.org/r1460753
Log:
Merged revisions 1460750 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1460750 | coheigea | 2013-03-25 16:25:35 +0000 (Mon, 25 Mar 2013) | 2 lines

  Fixing last merge

........

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=1460753&r1=1460752&r2=1460753&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:15 2013
@@ -97,13 +97,8 @@
         <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.xmlbeans.version>2.5.0</cxf.xmlbeans.version>
         <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>



Mime
View raw message