From 70ff3afc7b098a721d0bb8342b857e03cb754541 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Tue, 22 May 2018 16:55:13 +0900
Subject: [PATCH] Updates to Brave 5

---
 pom.xml                                                   | 2 +-
 spring-cloud-sleuth-core/pom.xml                          | 8 --------
 .../instrument/web/SleuthHttpClientParserTests.java       | 4 ----
 spring-cloud-sleuth-dependencies/pom.xml                  | 2 +-
 spring-cloud-sleuth-samples/pom.xml                       | 2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index c20c16ff7..eb2da7b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
 		<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-openfeign.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
-		<brave.version>4.19.2</brave.version>
+		<brave.version>5.0.0</brave.version>
 		<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
 	</properties>
 
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 84331f2fd..37de503c2 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -209,14 +209,6 @@
 			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<!-- to compile against Span.remoteEndpoint(zipkin.Span) -->
-		<dependency>
-			<groupId>io.zipkin.java</groupId>
-			<artifactId>zipkin</artifactId>
-			<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
-                        <version>2.8.0</version>
-			<optional>true</optional>
-		</dependency>
 		<!-- BRAVE -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpClientParserTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpClientParserTests.java
index d961d748b..3e736227d 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpClientParserTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpClientParserTests.java
@@ -90,8 +90,4 @@ class TestSpanCustomizer implements SpanCustomizer {
 	@Override public SpanCustomizer annotate(String value) {
 		return this;
 	}
-
-	@Override public SpanCustomizer annotate(long timestamp, String value) {
-		return this;
-	}
 }
\ No newline at end of file
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 12683285e..447c8828c 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -30,7 +30,7 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<brave.opentracing.version>0.30.3</brave.opentracing.version>
+		<brave.opentracing.version>0.31.0</brave.opentracing.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 7298f135b..c7ac21c2f 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -73,7 +73,7 @@
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>2.8.1</version>
+				<version>2.8.4</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>