[camel] 02/02: Fixed Camel-Vertx Karaf feature after upgrading

[acosentino]

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

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

commit 609e654d80480a56764e3e8a84968f4d4c55edab
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Feb 12 09:18:26 2018 +0100

    Fixed Camel-Vertx Karaf feature after upgrading
---
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index de7b7b2..9f0df51 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -704,6 +704,7 @@
     <velocity-tools-version>2.0</velocity-tools-version>
     <velocity-version>2.0</velocity-version>
     <vertx-version>3.5.1</vertx-version>
+    <vertx-jackson-version>2.9.0</vertx-jackson-version>
     <vysper-version>0.7</vysper-version>
     <weld1-version>1.1.28.Final</weld1-version>
     <weld2-version>2.4.6.Final</weld2-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a6b9e55..324178e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2287,9 +2287,9 @@
   </feature>
   <feature name='camel-vertx' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${vertx-jackson-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${vertx-jackson-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${vertx-jackson-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>

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