Repository: camel Updated Branches: refs/heads/master 7198f4123 -> 7e1e36210
Downgrade Jackson to version 2.8.7 to align a bit better components on the same version and fixed Camel-salesforce Karaf feature related to Jackson Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e1e3621 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e1e3621 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e1e3621 Branch: refs/heads/master Commit: 7e1e362109fe174ee76a16aa7cf3af385e5ba4fd Parents: 7198f41 Author: Andrea Cosentino <[email protected]> Authored: Wed Sep 6 13:06:37 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Wed Sep 6 13:06:37 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7e1e3621/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 54d16eb..a242f49 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -321,7 +321,7 @@ <jackson-spark-version>2.4.5</jackson-spark-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> <!-- jackson 2.9.x is not yet working with all camel components such as swagger-java --> - <jackson2-version>2.8.9</jackson2-version> + <jackson2-version>2.8.7</jackson2-version> <jackrabbit-version>2.15.5</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/7e1e3621/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 ec22f30..16bbd01 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1638,8 +1638,9 @@ <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:com.fasterxml.jackson.core/jackson-jaxrs-json-provider/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-module-jsonSchema/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-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>
