Author: davsclaus
Date: Tue Mar 5 09:13:23 2013
New Revision: 1452703
URL: http://svn.apache.org/r1452703
Log:
CAMEL-6122: Upgraded camel-jackson to Jackson 2.x. Thanks to David Karlsen for
the patch.
Modified:
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified:
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java?rev=1452703&r1=1452702&r2=1452703&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
(original)
+++
camel/trunk/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbBasicConverters.java
Tue Mar 5 09:13:23 2013
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Map;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
@@ -33,7 +34,6 @@ import org.apache.camel.converter.IOConv
import org.apache.camel.util.IOHelper;
import org.bson.BSONCallback;
import org.bson.BasicBSONDecoder;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1452703&r1=1452702&r2=1452703&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Mar 5 09:13:23 2013
@@ -451,8 +451,9 @@
<bundle>mvn:org.apache.camel/camel-irc/${project.version}</bundle>
</feature>
<feature name='camel-jackson' version='${project.version}' resolver='(obr)'
start-level='50'>
- <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>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jackson/${project.version}</bundle>
</feature>