From 0aec15243ffc1ebf1af36fe95a53d7e97f21ac40 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 2 Mar 2018 19:52:05 +0100
Subject: [PATCH] Reverted the Brave BOM

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

diff --git a/pom.xml b/pom.xml
index 7377cb921..bb0e52646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,13 +192,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>io.zipkin.brave</groupId>
-				<artifactId>brave-bom</artifactId>
-				<version>${brave.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<!-- Spock -->
 			<dependency>
 				<groupId>org.spockframework</groupId>
@@ -266,7 +259,6 @@
 		<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.16.3-SNAPSHOT</brave.version>
 	</properties>
 
 	<profiles>
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 3d4b166d7..deecc35f2 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -33,6 +33,7 @@
 		<zipkin.version>2.5.0</zipkin.version>
 		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
 		<zipkin-reporter2.version>2.3.3</zipkin-reporter2.version>
+		<brave.version>4.16.1</brave.version>
 		<brave.opentracing.version>0.28.0</brave.opentracing.version>
 	</properties>
 	<dependencyManagement>
@@ -82,6 +83,37 @@
 				<artifactId>spring-cloud-starter-sleuth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<!-- BRAVE -->
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave-context-log4j2</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave-instrumentation-spring-web</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave-instrumentation-spring-webmvc</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave-instrumentation-httpclient</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.zipkin.brave</groupId>
+				<artifactId>brave-instrumentation-httpasyncclient</artifactId>
+				<version>${brave.version}</version>
+			</dependency>
 			<!-- ZIPKIN -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>