This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new fb63411a GH-284: Upgrade to ActiveMQ 6.1.2 (#285)
fb63411a is described below
commit fb63411a6596816ad6ea234e5d94440bff5dc375
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Thu May 16 17:16:18 2024 +0200
GH-284: Upgrade to ActiveMQ 6.1.2 (#285)
---
components/camel-activemq/pom.xml | 1 +
features/src/main/feature/camel-features.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-activemq/pom.xml
b/components/camel-activemq/pom.xml
index 53a34469..b1811886 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -38,6 +38,7 @@
</camel.osgi.export>
<camel.osgi.import>
com.thoughtworks.xstream*;resolution:=optional,
+ org.apache.activemq*;version="[5,7)",
*
</camel.osgi.import>
</properties>
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 8ea5fda8..48213875 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -280,7 +280,7 @@
<feature name='camel-activemq' version='${project.version}'
start-level='50'>
<feature version='${camel.osgi.version.range}'>camel-jms</feature>
- <bundle
dependency='true'>mvn:org.apache.activemq/activemq-client-jakarta/${activemq-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.activemq/activemq-client/${activemq-version}</bundle>
<bundle
dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/1.11</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-activemq/${project.version}</bundle>
</feature>
diff --git a/pom.xml b/pom.xml
index 3bcde132..d715dc53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<camel.version>4.5.0</camel.version>
<!-- START: Maven Properties defining the version of 3rd party
libraries used in Camel -->
- <activemq-version>5.18.3</activemq-version>
+ <activemq-version>6.1.2</activemq-version>
<activemq-artemis-version>2.32.0</activemq-artemis-version>
<angus-mail-version>2.0.3</angus-mail-version>
<apacheds-version>2.0.0.AM26</apacheds-version>
