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/11/08 08:52:18 UTC
[5/6] camel git commit: Upgrade Consul client and related bundle to
version 0.13.2
Upgrade Consul client and related bundle to version 0.13.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c15f2d29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c15f2d29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c15f2d29
Branch: refs/heads/master
Commit: c15f2d295d565601504bee6bebd8da3046470a3c
Parents: 2ebb214
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 09:09:58 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 09:09:58 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 8 ++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c15f2d29/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 30a2acb..5cf5495 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,8 +144,8 @@
<commons-pool2-version>2.4.2</commons-pool2-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
<compress-lzf-version>1.0.3</compress-lzf-version>
- <consul-client-version>0.12.7</consul-client-version>
- <consul-client-bundle-version>0.12.7_1</consul-client-bundle-version>
+ <consul-client-version>0.13.2</consul-client-version>
+ <consul-client-bundle-version>0.13.2_1</consul-client-bundle-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<curator-version>2.11.0</curator-version>
<cxf-version>3.1.8</cxf-version>
@@ -580,6 +580,7 @@
<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>
+ <squareup-retrofit2-bundle-version>2.1.0_1</squareup-retrofit2-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/c15f2d29/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 d44e6dc..3fd9548 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -375,7 +375,15 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${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-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-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.okio/${squareup-okio-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.orbitz-consul-client/${consul-client-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-consul/${project.version}</bundle>
</feature>