From f586d0f7bbe9482609d13b791888d2bb1e1dad86 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Thu, 6 Oct 2022 14:11:09 +0200
Subject: [PATCH 1/2] Use Brave's bom instead of only managing a single Zipkin
 dependency

See gh-32614
---
 spring-boot-project/spring-boot-dependencies/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 4a397b71fcd..324e74b51c4 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1642,10 +1642,10 @@ bom {
 			]
 		}
 	}
-	library("Zipkin", "2.16.3") {
-		group("io.zipkin.reporter2") {
-			modules = [
-				"zipkin-sender-urlconnection"
+	library("Zipkin", "5.14.1") {
+		group("io.zipkin.brave") {
+			imports = [
+				"brave-bom"
 			]
 		}
 	}

From f1a7e84866f17323ef63dc7e25c1c2a3292d4a34 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 6 Oct 2022 21:58:25 +0100
Subject: [PATCH 2/2] Polish "Use Brave's bom instead of only managing a single
 Zipkin dependency"

See gh-32614
---
 .../spring-boot-dependencies/build.gradle          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 324e74b51c4..096de7b664a 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -58,6 +58,13 @@ bom {
 			]
 		}
 	}
+	library("Brave", "5.14.1") {
+		group("io.zipkin.brave") {
+			imports = [
+				"brave-bom"
+			]
+		}
+	}
 	library("Build Helper Maven Plugin", "3.3.0") {
 		group("org.codehaus.mojo") {
 			plugins = [
@@ -1642,13 +1649,6 @@ bom {
 			]
 		}
 	}
-	library("Zipkin", "5.14.1") {
-		group("io.zipkin.brave") {
-			imports = [
-				"brave-bom"
-			]
-		}
-	}
 }
 
 generateMetadataFileForMavenPublication {