cxf-commits mailing list archives

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

URL: http://svn.apache.org/r1460745
Log:
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.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=1460745&r1=1460744&r2=1460745&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:23:37 2013
@@ -154,8 +154,13 @@
         <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.xmlschema.version>2.0.3</cxf.xmlschema.version>
         <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
        



Mime
View raw message