Author: davsclaus
Date: Tue Mar 5 08:48:36 2013
New Revision: 1452697
URL: http://svn.apache.org/r1452697
Log:
CAMEL-6122: Upgraded camel-jackson to Jackson 2.x. Thanks to David Karlsen for
the patch.
Modified:
camel/trunk/components/camel-jackson/pom.xml
camel/trunk/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-jackson/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/pom.xml?rev=1452697&r1=1452696&r2=1452697&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/pom.xml (original)
+++ camel/trunk/components/camel-jackson/pom.xml Tue Mar 5 08:48:36 2013
@@ -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 -->
Modified:
camel/trunk/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java?rev=1452697&r1=1452696&r2=1452697&view=diff
==============================================================================
---
camel/trunk/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
(original)
+++
camel/trunk/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
Tue Mar 5 08:48:36 2013
@@ -23,7 +23,8 @@ import java.util.Map;
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})
Modified:
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java?rev=1452697&r1=1452696&r2=1452697&view=diff
==============================================================================
---
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
(original)
+++
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
Tue Mar 5 08:48:36 2013
@@ -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 {
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1452697&r1=1452696&r2=1452697&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 5 08:48:36 2013
@@ -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>
