From 7b40f0158dac63e62c5b6b38be2ba7bcf599dc6f Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Tue, 25 Sep 2018 21:30:42 -0400
Subject: [PATCH 1/4] Updates to latest brave

---
 pom.xml                                  | 2 +-
 spring-cloud-sleuth-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index aec1219bc..dad5e278f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,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>5.3.3</brave.version>
+		<brave.version>5.4.0</brave.version>
 		<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
 	</properties>
 
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 4b896f97a..eb86ab6a5 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.33.0</brave.opentracing.version>
+		<brave.opentracing.version>0.33.1</brave.opentracing.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

From cd87c36d2270d4eb9f976f7b87565c8fbabfd4bc Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Thu, 27 Sep 2018 12:17:31 -0400
Subject: [PATCH 2/4] zipkin bumps

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

diff --git a/pom.xml b/pom.xml
index dad5e278f..a04c57d68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,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>5.4.0</brave.version>
+		<brave.version>5.4.1</brave.version>
 		<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
 	</properties>
 
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index eb86ab6a5..bdf1a3579 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.33.1</brave.opentracing.version>
+		<brave.opentracing.version>0.33.2</brave.opentracing.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 98c42b7d9..8ecd671b6 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.11.5</version>
+				<version>2.11.6</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From ec70f26bc726f079ba6bda36b4fa03d6f5fb7f87 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Tue, 2 Oct 2018 07:27:29 +0800
Subject: [PATCH 3/4] Updates to latest brave patch

---
 pom.xml                                  | 2 +-
 spring-cloud-sleuth-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a04c57d68..b3db0928f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,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>5.4.1</brave.version>
+		<brave.version>5.4.2</brave.version>
 		<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
 	</properties>
 
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index bdf1a3579..6e644a35a 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.33.2</brave.opentracing.version>
+		<brave.opentracing.version>0.33.3</brave.opentracing.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

From 35deeb5d718186eebdad022c96a6ab0f39696d62 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Sat, 29 Sep 2018 12:43:53 +0100
Subject: [PATCH 4/4] Added conditional on class for BraveTracer; fixes gh-1075

---
 .../instrument/opentracing/OpentracingAutoConfiguration.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java
index 30ba998e7..25dba6e2b 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java
@@ -44,6 +44,7 @@ public class OpentracingAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@ConditionalOnClass(name = "brave.opentracing.BraveTracer")
 	Tracer sleuthOpenTracing(brave.Tracing braveTracing) {
 		return BraveTracer.create(braveTracing);
 	}