camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [1/2] camel git commit: CAMEL-10725: camel-zipkin - Upgrade to zipkin brave 4.x
Date Thu, 19 Jan 2017 13:07:18 GMT
Repository: camel
Updated Branches:
  refs/heads/master a2d3dd7c4 -> 6d8092585


CAMEL-10725: camel-zipkin - Upgrade to zipkin brave 4.x


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6d809258
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6d809258
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6d809258

Branch: refs/heads/master
Commit: 6d8092585a3abd778fbcadf146e6841bd08a34ca
Parents: fc6ae66
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Thu Jan 19 13:52:05 2017 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Thu Jan 19 14:06:31 2017 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6d809258/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ea732de..396fe58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -664,6 +664,8 @@
     <xstream-version>1.4.9</xstream-version>
     <xom-version>1.2.5</xom-version>
     <yammer-metrics-version>2.2.0</yammer-metrics-version>
+    <zipkin-version>1.19.2</zipkin-version>
+    <zipkin-reporter-version>0.6.12</zipkin-reporter-version>
     <zjsonpatch-version>0.3.0</zjsonpatch-version>
     <zookeeper-version>3.4.9</zookeeper-version>
     <zookeeper-guava-version>16.0</zookeeper-guava-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/6d809258/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 461d8ab..2c4b6f8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2030,8 +2030,8 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:io.zipkin.brave/brave-core/${brave-zipkin-version}</bundle>
     <bundle dependency='true'>mvn:io.zipkin.brave/brave-spancollector-scribe/${brave-zipkin-version}</bundle>
-    <bundle dependency='true'>mvn:io.zipkin.java/zipkin/1.19.2</bundle>
-    <bundle dependency='true'>mvn:io.zipkin.reporter/zipkin-reporter/0.6.12</bundle>
+    <bundle dependency='true'>mvn:io.zipkin.java/zipkin/${zipkin-version}</bundle>
+    <bundle dependency='true'>mvn:io.zipkin.reporter/zipkin-reporter/${zipkin-reporter-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${libthrift-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle>
   </feature>


Mime
View raw message