From 33bebf06739ca5c093f6ce2e583964b2f5bbc707 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 8 Mar 2022 13:15:14 -0800
Subject: [PATCH] Add explicit dependency management for Micrometer set to a
 version required by Apache Geode.

Apache Geode is based on Micrometer 1.6.x (1.6.3) whereas Spring Boot 3.0 is based on Micrometer 2.0.

However, setting the Micrometer version to 1.9.0-M3 which bridges Micrometer 1.x and 2.0.
---
 gradle.properties                   |  1 +
 gradle/dependency-management.gradle | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5025753a..ee137e71 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,7 @@ apacheGeodeVersion=1.14.3
 awaitilityVersion=4.2.0
 eclipseJettyVersion=9.4.39.v20210325
 findbugsVersion=3.0.2
+micrometerVersion=1.9.0-M3
 multithreadedtcVersion=1.01
 pivotalCloudCacheVersion=1.14.3
 pivotalGemFireVersion=9.10.14
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index 22f71ffa..4605275a 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,9 +1,17 @@
+ext['jetty.version'] = "$eclipseJettyVersion"
+ext['micrometer.version'] = "$micrometerVersion"
+
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
-		// Declared and managed Eclipse Jetty (BOM) version based on Apache Geode 1.14.3's declared,
-		// required Jetty version (9.x)! This Jetty version is incompatible with Jakarta EE 9 and Spring Boot 3.
+		// Declared and managed Micrometer (BOM) version based on Apache Geode 1.14.3's declared, required Micrometer
+		// version (1.6.3). Spring Boot 3.0 declares and depends on Micrometer 2.0.
+		mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
+		// Declared and managed Eclipse Jetty (BOM) version based on Apache Geode 1.14.3's declared, required Jetty
+		// version (9.x)! This Jetty version is incompatible with Jakarta EE 9 and Spring Boot 3. Spring Boot 3
+		// declares and uses Jetty 11.
 		mavenBom "org.eclipse.jetty:jetty-bom:$eclipseJettyVersion"
+		// Declared and managed Testcontainers libraries version.
 		mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion"
 	}
 	dependencies {