cxf-commits mailing list archives

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

URL: http://svn.apache.org/r1460750
Log:
Fixing last merge

Modified:
    cxf/branches/2.6.x-fixes/parent/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=1460750&r1=1460749&r2=1460750&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Mar 25 16:25:35 2013
@@ -154,13 +154,8 @@
         <cxf.woodstox.core.version>4.1.4</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>
-<<<<<<< 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.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
        



Mime
View raw message