Upgrade Jackson to 2.x for camel-salesforce feature Signed-off-by: Sune Keller <abs...@almbrand.dk>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5cbf8bb8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cbf8bb8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cbf8bb8 Branch: refs/heads/master Commit: 5cbf8bb8966544ba7073f531bedb7ef9b3a8b0b8 Parents: 8bb8c59 Author: Sune Keller <abs...@almbrand.dk> Authored: Wed Jun 15 09:36:41 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 16 07:55:44 2016 +0200 ---------------------------------------------------------------------- components/camel-salesforce/camel-salesforce-component/pom.xml | 4 ++++ platforms/karaf/features/src/main/resources/features.xml | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5cbf8bb8/components/camel-salesforce/camel-salesforce-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 780c9cf..eac801c 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -73,6 +73,10 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/5cbf8bb8/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 15ec379..3b85470 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1386,8 +1386,9 @@ <feature name='camel-salesforce' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> - <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-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-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle> <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
