Repository: camel Updated Branches: refs/heads/master 0e47e97e4 -> 8ec3c2c96
CAMEL-10346 - Upgrade camel-influxdb with the new influxdb bundle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85804280 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85804280 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85804280 Branch: refs/heads/master Commit: 8580428001e650b1afcf392b69b608a2148218a6 Parents: 152f869 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Sep 30 08:08:35 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Sep 30 10:44:28 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ platforms/karaf/features/src/main/resources/features.xml | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/85804280/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d1e1b97..065a34c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -267,6 +267,7 @@ <ignite-version-range>[1.5.0-b1,1.6)</ignite-version-range> <infinispan-version>8.2.4.Final</infinispan-version> <influx-java-driver-version>2.3</influx-java-driver-version> + <influx-java-driver-bundle-version>2.3_1</influx-java-driver-bundle-version> <irclib-bundle-version>1.10_5</irclib-bundle-version> <irclib-version>1.10</irclib-version> <ironmq-version>3.0.4</ironmq-version> @@ -576,6 +577,7 @@ <squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version> <squareup-okio-version>1.9.0</squareup-okio-version> <squareup-okio-bundle-version>1.9.0_1</squareup-okio-bundle-version> + <squareup-retrofit-bundle-version>1.9.0_1</squareup-retrofit-bundle-version> <sshd-version>0.14.0</sshd-version> <stompjms-version>1.19</stompjms-version> <swagger-scala-version>1.3.12</swagger-scala-version> http://git-wip-us.apache.org/repos/asf/camel/blob/85804280/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 abdfd6b..b1619d0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -834,7 +834,11 @@ </feature> <feature name='camel-influxdb' version='${project.version}' resolver='(obr)' start-level='50'> <details>The camel-influxdb feature requires Java 8</details> - <bundle dependency='true'>wrap:mvn:org.influxdb/influxdb-java/${influx-java-driver-version}</bundle> + <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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${squareup-okhttp-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.retrofit/${squareup-retrofit-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-influxdb/${project.version}</bundle> </feature>