From 92e434e26129bef00215cd20253a58b32c8ee12d Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Fri, 10 Nov 2017 15:21:21 +0800
Subject: [PATCH] Updates to zipkin version fixing encoding bug

---
 spring-cloud-sleuth-dependencies/pom.xml | 10 ++++++++--
 spring-cloud-sleuth-samples/pom.xml      |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index f427e69e2..3a6876d53 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -14,8 +14,8 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<zipkin.version>2.2.0</zipkin.version>
-		<zipkin-reporter.version>1.1.1</zipkin-reporter.version>
+		<zipkin.version>2.2.2</zipkin.version>
+		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -52,6 +52,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
+				<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
+				<version>2.2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.zipkin2</groupId>
+				<artifactId>zipkin</artifactId>
 				<version>${zipkin.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 9cd842a09..8f4929f80 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>2.2.0</version>
+				<version>2.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>2.2.0</version>
+				<version>2.2.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>