diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 199b0612ec..3191dc74e8 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -27,9 +27,23 @@ jobs: java-version: ${{ matrix.jdk }} distribution: temurin secrets: inherit + test: + name: Test Against Snapshots + uses: spring-io/spring-security-release-tools/.github/workflows/test.yml@b92832ecbc7cbe969201e6beafbde0ee400cf095 # v1.0.15 + strategy: + matrix: + include: + - java-version: 21-ea + toolchain: 21 + - java-version: 17 + toolchain: 17 + with: + java-version: ${{ matrix.java-version }} + test-args: --refresh-dependencies -PforceMavenRepositories=snapshot -PisOverrideVersionCatalog -PtestToolchain=${{ matrix.toolchain }} -PspringFrameworkVersion=7.0.+ -PreactorVersion=2025.0.+ -PspringDataVersion=2025.1.+ -PmicrometerVersion=1.16.+ --stacktrace + secrets: inherit deploy-artifacts: name: Deploy Artifacts - needs: [ build] + needs: [ build, test ] uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@b92832ecbc7cbe969201e6beafbde0ee400cf095 # v1.0.15 with: should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }} diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 9a3dcf9f9e..4d1db5c04b 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -12,13 +12,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 7b9b75bac1..9b52ec4c9a 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.16.5" 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:7.0.4" com-jayway-jsonpath-json-path = "com.jayway.jsonpath:json-path:2.10.0" commons-collections = "commons-collections:commons-collections:3.2.2" io-micrometer-context-propagation = "io.micrometer:context-propagation:1.2.1" -io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.16.5" +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.9" io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2025.0.5" io-rsocket-rsocket-bom = { module = "io.rsocket:rsocket-bom", version.ref = "io-rsocket" }