You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/07/07 08:40:27 UTC
camel git commit: Upgrade Jackson to version 2.8.0
Repository: camel
Updated Branches:
refs/heads/master 25e9ca642 -> edf2a3677
Upgrade Jackson to version 2.8.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/edf2a367
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/edf2a367
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/edf2a367
Branch: refs/heads/master
Commit: edf2a3677b594be122b8d014bb5361f2e4e7d04c
Parents: 25e9ca6
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jul 7 10:34:31 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jul 7 10:40:02 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/edf2a367/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 584935c..17fe1f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -267,7 +267,7 @@
<jackson-version>1.9.12</jackson-version>
<jackson-spark-version>2.4.5</jackson-spark-version>
<jackson2-scala-version>2.6.1</jackson2-scala-version>
- <jackson2-version>2.7.5</jackson2-version>
+ <jackson2-version>2.8.0</jackson2-version>
<jackrabbit-version>2.12.2</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/edf2a367/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index aef768e..3f2a98b 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -101,6 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
<executions>
<execution>
<id>filter</id>
http://git-wip-us.apache.org/repos/asf/camel/blob/edf2a367/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 a02d3f9..66178c7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -436,6 +436,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle>
+ <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
@@ -1695,6 +1696,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${swagger-java-guava-version}</bundle>