From 0ea87ca3bff2e82b362279555691f487560c1a70 Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Tue, 26 May 2026 15:14:22 -0600 Subject: [PATCH 1/2] Upgrade Micrometer to 1.15.11 Closes gh-19224 Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a1074acc6..8aaee11987 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:6.0.11" com-unboundid-unboundid-ldapsdk7 = "com.unboundid:unboundid-ldapsdk:7.0.1" commons-collections = "commons-collections:commons-collections:3.2.2" io-micrometer-context-propagation = "io.micrometer:context-propagation:1.1.4" -io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.14.14" +io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.15.11" io-mockk = "io.mockk:mockk:1.14.7" io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2024.0.17" io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" } From fe2e52f646f6beb534de2e49152c183c6e5a1529 Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Tue, 26 May 2026 15:15:27 -0600 Subject: [PATCH 2/2] Add Micrometer Version Override Closes gh-19187 Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com> --- .github/workflows/continuous-integration-workflow.yml | 2 +- dependencies/spring-security-dependencies.gradle | 3 +++ gradle/libs.versions.toml | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index f63f701726..e745470b8c 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -39,7 +39,7 @@ jobs: toolchain: 17 with: java-version: ${{ matrix.java-version }} - test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace + test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ -PmicrometerVersion=1.15.+ --stacktrace secrets: inherit check-samples: name: Check Samples diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 2a2d433252..234731b308 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -11,13 +11,16 @@ dependencies { def springFrameworkVersion = project.property("springFrameworkVersion") def reactorVersion = project.property("reactorVersion") def springDataVersion = project.property("springDataVersion") + def micrometerVersion = project.property("micrometerVersion") api platform("org.springframework:spring-framework-bom:$springFrameworkVersion") api platform("io.projectreactor:reactor-bom:$reactorVersion") api platform("org.springframework.data:spring-data-bom:$springDataVersion") + api platform("io.micrometer:micrometer-bom:$micrometerVersion") } else { api platform(libs.org.springframework.spring.framework.bom) api platform(libs.io.projectreactor.reactor.bom) api platform(libs.org.springframework.data.spring.data.bom) + api platform(libs.io.micrometer.micrometer.bom) } api platform(libs.io.rsocket.rsocket.bom) api platform(libs.org.junit.junit.bom) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8aaee11987..96420dce04 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] com-squareup-okhttp3 = "3.14.9" +io-micrometer = "1.15.11" io-rsocket = "1.1.5" io-spring-javaformat = "0.0.47" io-spring-nohttp = "0.0.11" @@ -29,7 +30,8 @@ com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:6.0.11" com-unboundid-unboundid-ldapsdk7 = "com.unboundid:unboundid-ldapsdk:7.0.1" commons-collections = "commons-collections:commons-collections:3.2.2" io-micrometer-context-propagation = "io.micrometer:context-propagation:1.1.4" -io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.15.11" +io-micrometer-micrometer-bom = { module = "io.micrometer:micrometer-bom", version.ref = "io-micrometer" } +io-micrometer-micrometer-observation = { module = "io.micrometer:micrometer-observation", version.ref = "io-micrometer" } io-mockk = "io.mockk:mockk:1.14.7" io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2024.0.17" io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" }