[camel] 35/41: CAMEL-12362: Upgrade to Apache Karaf 4.2.0

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 21a4dff0d5b5fef6811694ce920b401724f8d263
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 10 13:35:42 2018 +0200

    CAMEL-12362: Upgrade to Apache Karaf 4.2.0
---
 parent/pom.xml                                           | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index af85bdd..2919792 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -445,7 +445,7 @@
     <kafka-version>1.0.1</kafka-version>
     <kafka-bundle-version>1.0.1_1</kafka-bundle-version>
     <karaf2-version>2.4.4</karaf2-version>
-    <karaf4-version>4.1.5</karaf4-version>
+    <karaf4-version>4.2.0</karaf4-version>
     <kie-version>7.3.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
     <kubernetes-client-version>3.1.10</kubernetes-client-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 4c4f74b..f5a0aeb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -57,6 +57,7 @@
   <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle>
+    <feature>aries-blueprint</feature>
   </feature>
   <feature name='camel-spring' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>

-- 
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.