From 3d1e7a2e5e93de1aafd04e4fd52166058123bffb Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 16 Mar 2022 15:49:59 -0700 Subject: [PATCH] Add dependency management for Micrometer set to a version required by / compatible with Apache Geode 1.14. Apache Geode 1.14.x is based on Micrometer 1.6.3 while Spring Boot 3.0 (Spring Session 3.0) is based on Micrometer 2.0. Micrometer 1.9 is the bridge between framework, libraries and product still based on Micrometer 1.x while application frameworks like Spring Boot use Micrometer 2.0. Upgrade to Micrometer 1.9.0-M4. --- gradle.properties | 1 + gradle/dependency-management.gradle | 2 ++ 2 files changed, 3 insertions(+) diff --git a/gradle.properties b/gradle.properties index 5f3dfeb..08bb468 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 deployDocsHost=docs-ip.spring.io apacheGeodeVersion=1.14.2 +micrometerVersion=1.9.0-M4 # The Spring Boot & Spring Session version are the only required version properties. # The other Spring version properties are for overriding/testing purposes. springVersion=6.0.0-M2 diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 98fde98..90c3f6e 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -12,6 +12,7 @@ ext['logbackVersion'] = '1.2.3' ext['lombokVersion'] = "1.18.22" ext['junitVersion'] = '4.13.2' ext['junitJupiterVersion'] = '5.8.2' +ext['micrometer.version'] = "$micrometerVersion" ext['mockitoVersion'] = '4.2.0' ext['multithreadedtcVersion'] = '1.01' ext['seleniumHtmlUnitVersion'] = '2.56.0' @@ -25,6 +26,7 @@ ext['springShellVersion'] = '1.2.0.RELEASE' // Declare dependency management for the following dependencies. dependencyManagement { imports { + mavenBom "io.micrometer:micrometer-bom:$micrometerVersion" mavenBom "org.springframework:spring-framework-bom:${springVersion}" mavenBom "org.springframework.data:spring-data-bom:${springDataBomVersion}" // mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"