From aabd2d4fc76cb1e8f10c251a2949278314f92e7e Mon Sep 17 00:00:00 2001
From: "David J. M. Karlsen" <david@davidkarlsen.com>
Date: Mon, 4 Mar 2013 10:56:35 +0100
Subject: [PATCH] CAMEL-6122: Upgrade to jackson2. I hereby grant this patch to
 the ASF.

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 components/camel-jackson/pom.xml                            | 6 +++---
 .../apache/camel/component/jackson/JacksonDataFormat.java   | 3 ++-
 .../org/apache/camel/component/jackson/TestPojoView.java    | 2 +-
 parent/pom.xml                                              | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index dc72c4c98a40a..5a8bee51f8508 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -41,9 +41,9 @@
             <artifactId>camel-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson-version}</version>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>${jackson2-version}</version>
         </dependency>
 
         <!-- testing -->
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 119ef60fbc647..8dcda66a7629a 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -23,7 +23,8 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.DataFormat;
-import org.codehaus.jackson.map.ObjectMapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat})
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
index 23e777765b8ad..7062a372bcbfa 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jackson;
 
-import org.codehaus.jackson.map.annotate.JsonView;
+import com.fasterxml.jackson.annotation.JsonView;
 
 public class TestPojoView {
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 76922b8d12aec..347ab8444015d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,7 +178,7 @@
     <isorelax-bundle-version>20050913_4</isorelax-bundle-version>
     <jini-version>2.1</jini-version>
     <jackson-version>1.9.12</jackson-version>
-    <jackson2-version>2.1.3</jackson2-version>
+    <jackson2-version>2.1.4</jackson2-version>
     <jackrabbit-version>2.2.12</jackrabbit-version>
     <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
     <jasypt-bundle-version>1.9.0_1</jasypt-bundle-version>