cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/4] cxf git commit: Fixing merge
Date Mon, 25 Jul 2016 10:33:46 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f09bcb55
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f09bcb55
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f09bcb55

Branch: refs/heads/3.1.x-fixes
Commit: f09bcb55c8841279dbb4c64d777f7e1c50a98196
Parents: cb3e854
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Jul 25 10:49:59 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Jul 25 10:49:59 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f09bcb55/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 06e39fc..e9711ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,15 +68,9 @@
         <cxf.abdera.version>1.1.3</cxf.abdera.version>
         <cxf.activemq.version>5.12.0</cxf.activemq.version>
         <cxf.ahc.version>1.9.8</cxf.ahc.version>
-<<<<<<< HEAD
-        <cxf.apacheds.version>2.0.0-M22</cxf.apacheds.version>
+        <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
         <cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>
         <cxf.atmosphere.version.range>[2.0,2.4)</cxf.atmosphere.version.range>
-=======
-        <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
-        <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version>
-        <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
->>>>>>> 9b2bda5... Updating Apache DS
         <cxf.axiom.version>1.2.14</cxf.axiom.version>
         <cxf.bcprov.version>1.54</cxf.bcprov.version>
         <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>


Mime
View raw message