From 3b16cc6190797662cf95669404bd97300e768099 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Thu, 22 Mar 2018 23:52:00 +0800
Subject: [PATCH] Re-misaligns old zipkin version and removes internal class
 use

---
 spring-cloud-sleuth-dependencies/pom.xml                       | 2 +-
 .../cloud/sleuth/zipkin2/sender/RestTemplateSender.java        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 3aa61e5af..95c043832 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -69,7 +69,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
 				<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
-				<version>2.4.1</version>
+				<version>2.6.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java
index 969d74ee4..851682a40 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java
@@ -18,7 +18,6 @@ import zipkin2.codec.BytesEncoder;
 import zipkin2.codec.Encoding;
 import zipkin2.reporter.BytesMessageEncoder;
 import zipkin2.reporter.Sender;
-import zipkin2.reporter.internal.BaseCall;
 
 import static zipkin2.codec.SpanBytesEncoder.JSON_V2;
 
@@ -94,7 +93,7 @@ final class RestTemplateSender extends Sender {
 		this.restTemplate.exchange(requestEntity, String.class);
 	}
 
-	class HttpPostCall extends BaseCall<Void> {
+	class HttpPostCall extends Call.Base<Void> {
 		private final byte[] message;
 
 		HttpPostCall(byte[] message) {