Repository: camel Updated Branches: refs/heads/master b5ef19d75 -> c8e0a52e7
Upgrade Google Guava to version 19.0. Specify a different version, 18.0, for Camel-Docker in features. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8e0a52e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8e0a52e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8e0a52e Branch: refs/heads/master Commit: c8e0a52e7ff1f347b7f977f3cbc4bff797307061 Parents: b5ef19d Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Dec 10 10:49:17 2015 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Dec 10 10:50:40 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c8e0a52e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5671e20..2927d9e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -132,6 +132,7 @@ <disruptor-version>3.3.2</disruptor-version> <dnsjava-version>2.1.7</dnsjava-version> <dnsjava-bundle-version>2.1.7_1</dnsjava-bundle-version> + <docker-guava-version>18.0</docker-guava-version> <docker-java-version>1.4.0</docker-java-version> <docker-bundle-version>1.4.0_1</docker-bundle-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> @@ -190,7 +191,7 @@ <google-app-engine-bundle-version>1.9.28_1</google-app-engine-bundle-version> <google-gdata-version>1.41.5.w1</google-gdata-version> <google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version> - <google-guava-version>18.0</google-guava-version> + <google-guava-version>19.0</google-guava-version> <google-api-client-version>1.19.0</google-api-client-version> <google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version> <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version> http://git-wip-us.apache.org/repos/asf/camel/blob/c8e0a52e/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 cc266fd..b35aeef 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -336,7 +336,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${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:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${docker-guava-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
