Skip to content

Commit fe2e52f

Browse files
committed
Add Micrometer Version Override
Closes gh-19187 Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
1 parent 0ea87ca commit fe2e52f

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
toolchain: 17
4040
with:
4141
java-version: ${{ matrix.java-version }}
42-
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ --stacktrace
42+
test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=6.2.+ -PreactorVersion=2023.0.+ -PspringDataVersion=2024.0.+ -PmicrometerVersion=1.15.+ --stacktrace
4343
secrets: inherit
4444
check-samples:
4545
name: Check Samples

dependencies/spring-security-dependencies.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ dependencies {
1111
def springFrameworkVersion = project.property("springFrameworkVersion")
1212
def reactorVersion = project.property("reactorVersion")
1313
def springDataVersion = project.property("springDataVersion")
14+
def micrometerVersion = project.property("micrometerVersion")
1415
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
1516
api platform("io.projectreactor:reactor-bom:$reactorVersion")
1617
api platform("org.springframework.data:spring-data-bom:$springDataVersion")
18+
api platform("io.micrometer:micrometer-bom:$micrometerVersion")
1719
} else {
1820
api platform(libs.org.springframework.spring.framework.bom)
1921
api platform(libs.io.projectreactor.reactor.bom)
2022
api platform(libs.org.springframework.data.spring.data.bom)
23+
api platform(libs.io.micrometer.micrometer.bom)
2124
}
2225
api platform(libs.io.rsocket.rsocket.bom)
2326
api platform(libs.org.junit.junit.bom)

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[versions]
22
com-squareup-okhttp3 = "3.14.9"
3+
io-micrometer = "1.15.11"
34
io-rsocket = "1.1.5"
45
io-spring-javaformat = "0.0.47"
56
io-spring-nohttp = "0.0.11"
@@ -29,7 +30,8 @@ com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:6.0.11"
2930
com-unboundid-unboundid-ldapsdk7 = "com.unboundid:unboundid-ldapsdk:7.0.1"
3031
commons-collections = "commons-collections:commons-collections:3.2.2"
3132
io-micrometer-context-propagation = "io.micrometer:context-propagation:1.1.4"
32-
io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.15.11"
33+
io-micrometer-micrometer-bom = { module = "io.micrometer:micrometer-bom", version.ref = "io-micrometer" }
34+
io-micrometer-micrometer-observation = { module = "io.micrometer:micrometer-observation", version.ref = "io-micrometer" }
3335
io-mockk = "io.mockk:mockk:1.14.7"
3436
io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2024.0.17"
3537
io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" }

0 commit comments

Comments
 (0)