[camel] branch master updated: Lets use the same general jackson version for camel-vertx Karaf feature too

[ac...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 15a5714  Lets use the same general jackson version for camel-vertx Karaf feature too
15a5714 is described below

commit 15a5714cce3c0e83b00c5fe58c706ada236e2983
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 3 09:03:12 2018 +0200

    Lets use the same general jackson version for camel-vertx Karaf feature too
---
 parent/pom.xml                                           | 1 -
 platforms/karaf/features/src/main/resources/features.xml | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 13ecf45..608088c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -700,7 +700,6 @@
     <velocity-tools-version>2.0</velocity-tools-version>
     <velocity-version>2.0</velocity-version>
     <vertx-version>3.5.3</vertx-version>
-    <vertx-jackson-version>2.9.0</vertx-jackson-version>
     <vysper-version>0.7</vysper-version>
     <web3j-version>3.5.0</web3j-version>
     <weld1-version>1.1.28.Final</weld1-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 536f790..25fb95b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2320,9 +2320,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/${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: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: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>