[2/5] cxf git commit: Updating ActiveMQ

[co...@apache.org]

Updating ActiveMQ

# Conflicts:
#	parent/pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: cb1bcd4d89d9de2a3083e1c3afac0d2b6045d980
Parents: a2bc730
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 9 11:05:39 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 9 12:11:26 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/cb1bcd4d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f46e4e0..b4a2b5d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,7 +66,11 @@
         <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>