You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/09/25 11:32:59 UTC
[camel] 01/07: Revert "CAMEL-13615 - Camel-Zipkin: Zipkin-reporter
Move to new Apache coordinates"
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 08591b9ba0d4e248704a28d1a49116cde94f8183
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Sep 25 13:11:24 2019 +0200
Revert "CAMEL-13615 - Camel-Zipkin: Zipkin-reporter Move to new Apache coordinates"
This reverts commit 7be7c966e66a3f98e2db3997b150065523b92413.
---
components/camel-zipkin/pom.xml | 4 ++--
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index d4ffa74..64af195 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -51,12 +51,12 @@
<!-- to send to zipkin server -->
<dependency>
- <groupId>org.apache.zipkin.reporter2</groupId>
+ <groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-libthrift</artifactId>
<version>${zipkin-reporter-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.zipkin.reporter2</groupId>
+ <groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-urlconnection</artifactId>
<version>${zipkin-reporter-version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1279db3..29a464d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -672,7 +672,7 @@
<xstream-bundle-version>1.4.11_1</xstream-bundle-version>
<xstream-version>1.4.11</xstream-version>
<zendesk-client-version>0.6.2</zendesk-client-version>
- <zipkin-reporter-version>2.8.3</zipkin-reporter-version>
+ <zipkin-reporter-version>2.8.2</zipkin-reporter-version>
<zipkin-version>2.14.0</zipkin-version>
<zjsonpatch-version>0.3.0</zjsonpatch-version>
<zookeeper-version>3.4.14</zookeeper-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 151528a..6f0ecbf 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2797,9 +2797,9 @@
<bundle dependency='true'>mvn:io.zipkin.brave/brave/${brave-zipkin-version}</bundle>
<bundle dependency='true'>wrap:mvn:io.zipkin.brave/brave-context-slf4j/${brave-zipkin-version}</bundle>
<bundle dependency='true'>mvn:org.apache.zipkin.zipkin2/zipkin/${zipkin-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zipkin.reporter2/zipkin-reporter/${zipkin-reporter-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zipkin.reporter2/zipkin-sender-libthrift/${zipkin-reporter-version}</bundle>
+ <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>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle>
</feature>