cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Tue, 28 Jun 2016 11:33:00 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/5afe2b87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5afe2b87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5afe2b87

Branch: refs/heads/3.1.x-fixes
Commit: 5afe2b87e820a9847e5b6cfbac3d9c85a28f0a19
Parents: 859b7f9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Jun 28 12:32:50 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Jun 28 12:32:50 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5afe2b87/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8a50405..7fb57e6 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-M21</cxf.apacheds.version>
+        <cxf.apacheds.version>2.0.0-M22</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-M22</cxf.apacheds.version>
-        <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version>
-        <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
->>>>>>> 91bb2a1... 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