cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [5/5] cxf git commit: Fixing merge
Date Fri, 09 Dec 2016 12:11:59 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/e9100af2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9100af2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9100af2

Branch: refs/heads/3.1.x-fixes
Commit: e9100af2a7ed333cdfe65225c9976d73301d7a9a
Parents: 31b01b6
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Dec 9 12:11:47 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Dec 9 12:11:47 2016 +0000

----------------------------------------------------------------------
 parent/pom.xml | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e9100af2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ef7ab2..94b7183 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,11 +66,7 @@
         <cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.version>1.1.3</cxf.abdera.version>
-<<<<<<< HEAD
-        <cxf.activemq.version>5.12.0</cxf.activemq.version>
-=======
         <cxf.activemq.version>5.12.2</cxf.activemq.version>
->>>>>>> 9cd3116... Updating ActiveMQ
         <cxf.ahc.version>1.9.8</cxf.ahc.version>
         <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
         <cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>


Mime
View raw message