From 866935c95218c12f531cb3c890fef68233550dbf Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 6 Apr 2022 12:08:53 -0700 Subject: [PATCH] Remove dependency management for Micrometer. This implies that Spring Boot 3.0's dependency management for Micrometer, based on 2.0, will be enforced. --- gradle.properties | 2 +- gradle/dependency-management.gradle | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b759ae05..ee069bb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 eclipseJettyVersion=9.4.39.v20210325 findbugsVersion=3.0.2 -micrometerVersion=1.9.0-SNAPSHOT +#micrometerVersion=1.9.0-SNAPSHOT multithreadedtcVersion=1.01 pivotalCloudCacheVersion=1.14.4 pivotalGemFireVersion=9.10.15 diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 4605275a..ca35cfc8 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,16 +1,19 @@ ext['jetty.version'] = "$eclipseJettyVersion" -ext['micrometer.version'] = "$micrometerVersion" +//ext['micrometer.version'] = "$micrometerVersion" dependencyManagement { imports { mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion" + // 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" + //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" }