[camel] branch master updated: CAMEL-13494 - Camel-SAP-Netweaver: Move to Jackson 2.x

[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


The following commit(s) were added to refs/heads/master by this push:
     new 042a9ec  CAMEL-13494 - Camel-SAP-Netweaver: Move to Jackson 2.x
042a9ec is described below

commit 042a9ecfb621f2e1b6165d5fc1805676d68954fa
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 9 11:52:02 2019 +0200

    CAMEL-13494 - Camel-SAP-Netweaver: Move to Jackson 2.x
---
 components/camel-sap-netweaver/pom.xml                  | 17 ++++++++++++++---
 .../component/sap/netweaver/NetWeaverProducer.java      |  3 ++-
 .../karaf/features/src/main/resources/features.xml      |  5 +++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/components/camel-sap-netweaver/pom.xml 
b/components/camel-sap-netweaver/pom.xml
index 201d6e0..890b47d 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -44,10 +44,21 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-http4</artifactId>
         </dependency>
+        <!-- Jackson -->
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson-version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson2-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson2-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson2-version}</version>
         </dependency>
 
         <!-- test dependencies -->
diff --git 
a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
 
b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index 1278724..f659001 100644
--- 
a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ 
b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.sap.netweaver;
 
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Producer;
@@ -25,7 +27,6 @@ import org.apache.camel.support.DefaultProducer;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.URISupport;
-import org.codehaus.jackson.map.ObjectMapper;
 
 public class NetWeaverProducer extends DefaultProducer {
 
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index fd32b3c..a88b3ce 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2110,8 +2110,9 @@
   <feature name='camel-sap-netweaver' version='${project.version}' 
start-level='50'>
     <feature>http</feature>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle 
dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${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>mvn:org.apache.camel/camel-sap-netweaver/${project.version}</bundle>
   </feature>
   <feature name='camel-salesforce' version='${project.version}' 
start-level='50'>