From 183ea3b8cf64f86ce3ad1ddba0a8e10ef30a02c1 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 21 Nov 2017 19:37:07 +0100
Subject: [PATCH] Revert "Updates to zipkin version fixing encoding bug"

This reverts commit dfc5ae5
---
 spring-cloud-sleuth-dependencies/pom.xml | 45 ++++++++++++++++++++++++
 spring-cloud-sleuth-samples/pom.xml      |  9 +----
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 4f9c1ceea..2fbd7d535 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -16,6 +16,7 @@
 	<properties>
 		<zipkin.version>2.2.2</zipkin.version>
 		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
+		<zipkin-reporter2.version>2.1.4</zipkin-reporter2.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -24,6 +25,16 @@
 				<artifactId>spring-cloud-sleuth-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-sleuth-reactor</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-sleuth-zipkin-legacy</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-sleuth-zipkin</artifactId>
@@ -39,6 +50,11 @@
 				<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-zipkin-legacy</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-zipkin</artifactId>
@@ -85,6 +101,35 @@
 				<artifactId>zipkin-reporter</artifactId>
 				<version>${zipkin-reporter.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.zipkin.reporter2</groupId>
+				<artifactId>zipkin-reporter</artifactId>
+				<version>${zipkin-reporter2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.reporter2</groupId>
+				<artifactId>zipkin-sender-kafka11</artifactId>
+				<version>${zipkin-reporter2.version}</version>
+				<exclusions>
+					<!-- assigned with spring-kafka -->
+					<exclusion>
+						<groupId>org.apache.kafka</groupId>
+						<artifactId>kafka-clients</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.reporter2</groupId>
+				<artifactId>zipkin-sender-amqp-client</artifactId>
+				<version>${zipkin-reporter2.version}</version>
+				<exclusions>
+					<!-- assigned with spring-rabbit -->
+					<exclusion>
+						<groupId>com.rabbitmq</groupId>
+						<artifactId>amqp-client</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<profiles>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 4f0000275..9ddd4918c 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -24,8 +24,6 @@
 		<module>spring-cloud-sleuth-sample-feign</module>
 		<module>spring-cloud-sleuth-sample-ribbon</module>
 		<module>spring-cloud-sleuth-sample-zipkin</module>
-		<module>spring-cloud-sleuth-sample-stream</module>
-		<module>spring-cloud-sleuth-sample-zipkin-stream</module>
 	</modules>
 
 	<build>
@@ -57,15 +55,10 @@
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>io.zipkin.java</groupId>
+				<groupId>io.zipkin.zipkin2</groupId>
 				<artifactId>zipkin</artifactId>
 				<version>2.2.2</version>
 			</dependency>
-			<dependency>
-				<groupId>io.zipkin.java</groupId>
-				<artifactId>zipkin-server</artifactId>
-				<version>2.2.2</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>