You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jp...@apache.org on 2019/06/05 08:15:28 UTC
[camel] 01/02: CAMEL-13539 Upgrade consul-client to 1.3.3 for
retrofit 2.5.0
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 85c0db2ad06aae3811d73923ef59c9186b415fae
Author: jpoth <po...@gmail.com>
AuthorDate: Fri May 17 10:43:22 2019 +0200
CAMEL-13539 Upgrade consul-client to 1.3.3 for retrofit 2.5.0
---
parent/pom.xml | 7 +++----
platforms/karaf/features/src/main/resources/features.xml | 6 ++++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d5408c..87db5a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,8 +156,8 @@
<commons-pool2-version>2.6.2</commons-pool2-version>
<commons-text-version>1.6</commons-text-version>
<compress-lzf-version>1.0.4</compress-lzf-version>
- <consul-client-version>1.2.5</consul-client-version>
- <consul-client-bundle-version>1.2.5_1</consul-client-bundle-version>
+ <consul-client-version>1.3.3</consul-client-version>
+ <consul-client-bundle-version>1.3.3_1</consul-client-bundle-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<corda-version>3.3-corda</corda-version>
<couchbase-client-version>1.4.13</couchbase-client-version>
@@ -656,8 +656,7 @@
<squareup-okhttp-version>2.7.5</squareup-okhttp-version>
<squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version>
<squareup-okio-bundle-version>1.15.0_1</squareup-okio-bundle-version>
- <squareup-retrofit-bundle-version>1.9.0_1</squareup-retrofit-bundle-version>
- <squareup-retrofit2-bundle-version>2.4.0_1</squareup-retrofit2-bundle-version>
+ <squareup-retrofit2-bundle-version>2.5.0_2</squareup-retrofit2-bundle-version>
<sshd-version>2.0.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
<swagger-java-version>1.5.21</swagger-java-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ad7f7f7..7255fed 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -707,12 +707,14 @@
<feature name='camel-consul' version='${project.version}' start-level='50'>
<feature prerequisite='true'>wrap</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/27.1-jre</bundle>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-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'>wrap:mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}$overwrite=merge&Import-Package=com.google.*;version="[22.0,23.0)",*</bundle>
+ <bundle dependency='true'>wrap:mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}$overwrite=merge&Import-Package=com.google.*;version="[27.1,28.0)",*</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${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>