activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject activemq git commit: Upgrade Apache Camel to 2.20.0
Date Sun, 15 Oct 2017 08:01:41 GMT
Repository: activemq
Updated Branches:
  refs/heads/master e79326057 -> 02cd02e98


Upgrade Apache Camel to 2.20.0


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

Branch: refs/heads/master
Commit: 02cd02e981e5a644b09821d7ce736426b95ecffa
Parents: e793260
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Sun Oct 15 09:41:32 2017 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Sun Oct 15 09:57:40 2017 +0200

----------------------------------------------------------------------
 activemq-camel/pom.xml | 7 +++++++
 pom.xml                | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/02cd02e9/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index b933f97..985e4b7 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -58,6 +58,13 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
+      <exclusions>
+        <!-- ActiveMQ is JMS 1.1 spec only -->
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_2.0_spec</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- use the Camel apt compiler plugin -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/activemq/blob/02cd02e9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c3e117..f12148f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
     <aries-version>1.1.0</aries-version>
     <aries-transaction-version>1.1.1</aries-transaction-version>
     <axion-version>1.0-M3-dev</axion-version>
-    <camel-version>2.19.3</camel-version>
-    <camel-version-range>[2.18,3)</camel-version-range>
+    <camel-version>2.20.0</camel-version>
+    <camel-version-range>[2.19,3)</camel-version-range>
     <cglib-version>2.2</cglib-version>
     <commons-beanutils-version>1.9.3</commons-beanutils-version>
     <commons-collections-version>3.2.2</commons-collections-version>


Mime
View raw message