This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0f386c5 Upgrade Karaf to version 4.2.6
0f386c5 is described below
commit 0f386c561d01c297fba6d3f2f7f192d38f43d1b3
Author: jpoth <poth.j...@gmail.com>
AuthorDate: Wed Jun 12 16:17:34 2019 +0200
Upgrade Karaf to version 4.2.6
---
parent/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index feedf52..8c52f26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
<cxf.xjc.jvmArgs/>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
+ <javax-activation-version-range>[0,2)</javax-activation-version-range>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.15.9</activemq-version>
<activemq-artemis-version>2.9.0</activemq-artemis-version>
@@ -435,7 +436,7 @@
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
<kafka-version>2.2.0</kafka-version>
<kafka-bundle-version>2.2.0_1</kafka-bundle-version>
- <karaf4-version>4.2.5</karaf4-version>
+ <karaf4-version>4.2.6</karaf4-version>
<kie-version>7.22.0.Final</kie-version>
<kubernetes-client-version>4.1.1</kubernetes-client-version>
<kubernetes-model-version>4.1.1</kubernetes-model-version>
@@ -6054,6 +6055,7 @@
</activation>
<properties>
<cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+
<camel.osgi.import.defaults>javax.activation;version="${javax-activation-version-range}"</camel.osgi.import.defaults>
</properties>
<build>
<pluginManagement>
