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/fc6ae66e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc6ae66e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc6ae66e Branch: refs/heads/master Commit: fc6ae66eccb41332b0457d6f13fffcebc199b590 Parents: a2d3dd7 Author: Andrea Cosentino <[email protected]> Authored: Thu Jan 19 12:52:20 2017 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Thu Jan 19 14:06:31 2017 +0100 ---------------------------------------------------------------------- components/camel-zipkin/pom.xml | 4 ++-- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fc6ae66e/components/camel-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml index 1c7c4cc..d030096 100644 --- a/components/camel-zipkin/pom.xml +++ b/components/camel-zipkin/pom.xml @@ -44,13 +44,13 @@ <!-- brave/zkpkin --> <dependency> - <groupId>com.github.kristofa</groupId> + <groupId>io.zipkin.brave</groupId> <artifactId>brave-core</artifactId> <version>${brave-zipkin-version}</version> </dependency> <!-- to send to zipkin server --> <dependency> - <groupId>com.github.kristofa</groupId> + <groupId>io.zipkin.brave</groupId> <artifactId>brave-spancollector-scribe</artifactId> <version>${brave-zipkin-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fc6ae66e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 15c3330..ea732de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,7 +84,7 @@ <bouncycastle-version>1.55</bouncycastle-version> <boxjavalibv2.version>3.2.1</boxjavalibv2.version> <braintree-gateway-version>2.63.0</braintree-gateway-version> - <brave-zipkin-version>3.7.0</brave-zipkin-version> + <brave-zipkin-version>4.0.3</brave-zipkin-version> <brave-zipkin-bundle-version>3.7.0_1</brave-zipkin-bundle-version> <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version> <c3p0-version>0.9.5.2</c3p0-version> http://git-wip-us.apache.org/repos/asf/camel/blob/fc6ae66e/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 5648bc8..461d8ab 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -2028,7 +2028,10 @@ </feature> <feature name='camel-zipkin' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.brave-zipkin/${brave-zipkin-bundle-version}</bundle> + <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:org.apache.thrift/libthrift/${libthrift-version}</bundle> <bundle>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle> </feature>
