This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.25.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 77b2f6224de2113a5a82b6a6dc0babdd967826a2 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Dec 18 14:10:46 2020 +0100 Upgrade consul and fix its karaf feature --- parent/pom.xml | 4 ++-- platforms/karaf/features/src/main/resources/features.xml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 86bd7ff..017d422 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -161,8 +161,8 @@ <commons-text-version>1.6</commons-text-version> <commons-vfs2-version>2.0</commons-vfs2-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> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index ac2a58a..95415a7 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -428,14 +428,15 @@ <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle> </feature> <feature name='camel-consul' version='${project.version}' resolver='(obr)' start-level='50'> - <details>camel-consul currently do not work in OSGi</details> <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-databind-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'>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>
