This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit d93e633bf8cd006d332cb32699b7ffc708f6fe32 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Sat Jan 25 12:54:33 2020 +0100 Aligned Camel-Zipkin Karaf feature --- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 92295fa..d0c6b01 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -676,6 +676,7 @@ <zendesk-client-version>0.6.2</zendesk-client-version> <zipkin-reporter-version>2.12.1</zipkin-reporter-version> <zipkin-version>2.19.3</zipkin-version> + <zipkin-libthrift-version>0.13.0</zipkin-libthrift-version> <zjsonpatch-version>0.3.0</zjsonpatch-version> <zookeeper-version>3.4.14</zookeeper-version> <zookeeper-guava-version>16.0</zookeeper-guava-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index e9420ce..527ec9f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -2770,7 +2770,7 @@ <bundle dependency='true'>mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin-reporter-version}</bundle> <bundle dependency='true'>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter-version}</bundle> <bundle dependency='true'>mvn:io.zipkin.reporter2/zipkin-sender-libthrift/${zipkin-reporter-version}</bundle> - <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${libthrift-version}</bundle> + <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${zipkin-libthrift-version}</bundle> <bundle>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle> </feature> <feature name='camel-zookeeper' version='${project.version}' start-level='50'>