From 516963cd2fca3eef6176a893fd25fd53a31251bc Mon Sep 17 00:00:00 2001
From: Adrian Cole <adriancole@users.noreply.github.com>
Date: Sat, 15 Jun 2019 23:16:08 +0800
Subject: [PATCH] Updates to latest Brave (#1373)

---
 benchmarks/pom.xml                                              | 2 +-
 pom.xml                                                         | 2 +-
 spring-cloud-sleuth-dependencies/pom.xml                        | 2 +-
 spring-cloud-sleuth-samples/pom.xml                             | 2 +-
 spring-cloud-sleuth-zipkin/pom.xml                              | 2 +-
 .../sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java   | 2 +-
 .../cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 687cf648f..22640001a 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -34,7 +34,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
-		<brave.version>5.4.3</brave.version>
+		<brave.version>5.6.5</brave.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index c00dfbed3..ec053fe7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
 		<spring-cloud-netflix.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-openfeign.version>2.2.0.BUILD-SNAPSHOT
 		</spring-cloud-openfeign.version>
-		<brave.version>5.6.1</brave.version>
+		<brave.version>5.6.5</brave.version>
 		<spring-security-boot-autoconfigure.version>2.1.3.RELEASE
 		</spring-security-boot-autoconfigure.version>
 		<disable.nohttp.checks>false</disable.nohttp.checks>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 78af0f721..63be3e9bd 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -31,7 +31,7 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<brave.opentracing.version>0.33.10</brave.opentracing.version>
+		<brave.opentracing.version>0.33.13</brave.opentracing.version>
 		<grpc.spring.boot.version>3.0.1</grpc.spring.boot.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 8b5e55a98..3ab087641 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.12.0</version>
+				<version>2.14.2</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 537f2335e..52518583a 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -80,7 +80,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.zipkin.reporter2</groupId>
-			<artifactId>zipkin-sender-kafka11</artifactId>
+			<artifactId>zipkin-sender-kafka</artifactId>
 			<exclusions>
 				<!-- assigned with spring-kafka -->
 				<exclusion>
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java
index 1fb894d6f..f4b500360 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import zipkin2.reporter.Sender;
-import zipkin2.reporter.kafka11.KafkaSender;
+import zipkin2.reporter.kafka.KafkaSender;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java
index 22b1076a9..2d290a316 100644
--- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java
+++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java
@@ -37,7 +37,7 @@ import zipkin2.reporter.AsyncReporter;
 import zipkin2.reporter.Reporter;
 import zipkin2.reporter.Sender;
 import zipkin2.reporter.amqp.RabbitMQSender;
-import zipkin2.reporter.kafka11.KafkaSender;
+import zipkin2.reporter.kafka.KafkaSender;
 
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;