[camel] branch master updated: Lets use a single version of Libthrift everywhere (0.11.0)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: Lets use a single version of Libthrift everywhere (0.11.0)

acosentino
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


The following commit(s) were added to refs/heads/master by this push:
     new c3ba586  Lets use a single version of Libthrift everywhere (0.11.0)
c3ba586 is described below

commit c3ba586dddf4003c9be3307c04607f3d9554c124
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Aug 1 14:29:56 2018 +0200

    Lets use a single version of Libthrift everywhere (0.11.0)
---
 parent/pom.xml                                           | 1 -
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 0ef7d96..cfe803a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -742,7 +742,6 @@
     <xstream-version>1.4.10</xstream-version>
     <xom-version>1.2.5</xom-version>
     <zendesk-client-version>0.6.2</zendesk-client-version>
-    <zipkin-libthrift-version>0.9.3</zipkin-libthrift-version>
     <zipkin-reporter-version>2.7.6</zipkin-reporter-version>
     <zipkin-version>2.10.4</zipkin-version>
     <zjsonpatch-version>0.3.0</zjsonpatch-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 5ab8535..536f790 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2491,7 +2491,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/${zipkin-libthrift-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${libthrift-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle>
   </feature>
   <feature name='camel-zookeeper' version='${project.version}' resolver='(obr)' start-level='50'>