From bd98537297dbe70713e598a9face4c6ddfdcdae7 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 | 11 +++++------
 spring-cloud-sleuth-samples/pom.xml      |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index ef9b2a35e..5289072eb 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -14,11 +14,9 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
-		<zipkin.version>2.2.0</zipkin.version>
-		<zipkin2.version>2.2.1</zipkin2.version>
+		<zipkin.version>2.2.2</zipkin.version>
 		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
-		<zipkin-reporter2.version>2.1.3</zipkin-reporter2.version>
+		<zipkin-reporter2.version>2.1.4</zipkin-reporter2.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -70,12 +68,13 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>${zipkin.version}</version>
+				<!-- 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>${zipkin2.version}</version>
+				<version>${zipkin.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 73ca81a77..dc84c9fac 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -57,7 +57,7 @@
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>2.2.1</version>
+				<version>2.2.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>