From 32d8ea8fc7f951672e9e2f5149c15df3118acf26 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adriancole@users.noreply.github.com>
Date: Thu, 19 Jan 2017 20:17:24 +0800
Subject: [PATCH] Updates to latest zipkin 1.19 (#495)

Most changes are not very interesting to sleuth, though the server is
quite a lot better with UI fixes galore. For sleuth mainly, small api
unaffecting glitch fixes around the Span.Builder.
---
 spring-cloud-sleuth-dependencies/pom.xml                   | 4 ++--
 spring-cloud-sleuth-samples/pom.xml                        | 4 ++--
 .../spring-cloud-sleuth-sample-zipkin/pom.xml              | 7 +++++++
 spring-cloud-sleuth-zipkin/pom.xml                         | 7 +++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index da198227f..1f2f539fc 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>1.16.2</zipkin.version>
-		<zipkin-reporter.version>0.6.9</zipkin-reporter.version>
+		<zipkin.version>1.19.2</zipkin.version>
+		<zipkin-reporter.version>0.6.12</zipkin-reporter.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index c7dec2e9b..462d9df76 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>1.16.2</version>
+				<version>1.19.2</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>1.16.2</version>
+				<version>1.19.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
index e73a84430..3db678c30 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -107,6 +107,13 @@
 			<artifactId>zipkin-junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- otherwise spring boot's version of okhttp kicks zipkin-junit's deps out of alignment -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.5.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 0b7d03f1b..cfe6bf235 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -88,6 +88,13 @@
 			<artifactId>zipkin-junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- otherwise spring boot's version of okhttp kicks zipkin-junit's deps out of alignment -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.5.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>