Repository: camel Updated Branches: refs/heads/master 357d279a6 -> b00c06dd7
Upgrade InfluxDB and related bundle to version 2.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b00c06dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b00c06dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b00c06dd Branch: refs/heads/master Commit: b00c06dd7780bff107ba289cb44b5fa197760319 Parents: c33b14a Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Jan 6 09:36:22 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Jan 6 09:37:54 2017 +0100 ---------------------------------------------------------------------- parent/pom.xml | 5 +++-- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b00c06dd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5720166..d7fb1e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -271,8 +271,9 @@ <ignite-version>1.8.0</ignite-version> <ignite-version-range>[1.5.0-b1,1.6)</ignite-version-range> <infinispan-version>8.2.5.Final</infinispan-version> - <influx-java-driver-version>2.4</influx-java-driver-version> - <influx-java-driver-bundle-version>2.4_2</influx-java-driver-bundle-version> + <influx-java-driver-version>2.5</influx-java-driver-version> + <influx-java-driver-bundle-version>2.5_1</influx-java-driver-bundle-version> + <influx-guava-version>20.0</influx-guava-version> <irclib-bundle-version>1.10_5</irclib-bundle-version> <irclib-version>1.10</irclib-version> <ironmq-version>3.0.4</ironmq-version> http://git-wip-us.apache.org/repos/asf/camel/blob/b00c06dd/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 ae2e5eb..724e294 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -886,7 +886,7 @@ <feature name='camel-influxdb' version='${project.version}' resolver='(obr)' start-level='50'> <details>The camel-influxdb feature requires Java 8</details> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.influxdb-java/${influx-java-driver-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${influx-guava-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.retrofit/${squareup-retrofit2-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
