From 9abdcc0e6fed221a682b7e5ae7ebe12aad704447 Mon Sep 17 00:00:00 2001 From: Botond Lovasz Date: Wed, 19 Nov 2025 11:54:32 +0200 Subject: [PATCH 1/2] minor: Upgrade Spring (3.5.7) & Spring Cloud (2025) --- gradle/libs.versions.toml | 4 ++-- platform-spring-bom/build.gradle | 3 +++ platform-spring-test-bom/build.gradle | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 461033b..e188316 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,8 +18,8 @@ opentelemetry = "1.48.0" shedlock = "6.3.0" -spring-boot = "3.4.5" -spring-cloud = "2024.0.1" +spring-boot = "3.5.7" +spring-cloud = "2025.0.0" [libraries] archunit-ccv = { module = "io.cloudflight.cleancode.archunit:archunit-cleancode-verifier", version = "0.5.0" } diff --git a/platform-spring-bom/build.gradle b/platform-spring-bom/build.gradle index 1cdf9da..807b70c 100644 --- a/platform-spring-bom/build.gradle +++ b/platform-spring-bom/build.gradle @@ -48,6 +48,9 @@ subprojects { p -> testImplementation project(':platform-spring-test-bom:platform-spring-test-bdd') + // https://stackoverflow.com/a/79650948 + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + if (p.plugins.hasPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper)) { kapt platform(project(':platform-spring-bom')) } diff --git a/platform-spring-test-bom/build.gradle b/platform-spring-test-bom/build.gradle index 5583e6b..b799e55 100644 --- a/platform-spring-test-bom/build.gradle +++ b/platform-spring-test-bom/build.gradle @@ -37,6 +37,9 @@ subprojects { dependencies { // platform-spring-test-bom (and so all libraries from above) goes to the api classpath (implementation) implementation platform(project(':platform-spring-test-bom')) + + // https://stackoverflow.com/a/79650948 + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } } From 87b0c00585e5dc609ac41dc399bfdefc97ce11ed Mon Sep 17 00:00:00 2001 From: Botond Lovasz Date: Wed, 19 Nov 2025 12:03:46 +0200 Subject: [PATCH 2/2] minor: Upgrade other dependencies --- gradle/libs.versions.toml | 24 +++++++++---------- .../azurite/AzuriteContainer.kt | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e188316..0edef5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,22 +1,22 @@ [versions] -assertj = "3.26.0" +assertj = "3.27.6" -azure = "5.21.0" -azure-identity = "1.15.4" +azure = "5.23.0" +azure-identity = "1.18.1" # we provide the latest version of guava here, as queryDSL pulls in a very old (and vulnerable) version of guava, and we want to override that here -guava = "33.2.1-jre" +guava = "33.4.8-jre" jgiven = "1.3.1" -jupiter = "5.11.4" +jupiter = "5.14.1" kotlin-logging = "3.0.5" logstash = "7.4" -opentelemetry = "1.48.0" +opentelemetry = "1.56.0" -shedlock = "6.3.0" +shedlock = "6.10.0" spring-boot = "3.5.7" spring-cloud = "2025.0.0" @@ -26,12 +26,12 @@ archunit-ccv = { module = "io.cloudflight.cleancode.archunit:archunit-cleancode- assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" } -awaitility = { module = "org.awaitility:awaitility", version = "4.2.1" } +awaitility = { module = "org.awaitility:awaitility", version = "4.3.0" } azure-dependencies-bom = { module = "com.azure.spring:spring-cloud-azure-dependencies", version.ref = "azure" } azure-identity = { module = "com.azure:azure-identity", version.ref = "azure-identity" } -jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version = "0.2.6" } +jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version = "0.2.8" } jgiven-html5-report = { module = "com.tngtech.jgiven:jgiven-html5-report", version.ref = "jgiven" } jgiven-junit5 = { module = "com.tngtech.jgiven:jgiven-html5-report", version.ref = "jgiven" } @@ -61,7 +61,7 @@ spring-boot-bom = { module = "org.springframework.boot:spring-boot-dependencies" spring-cloud-bom = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" } springfox-swagger2 = { module = "io.springfox:springfox-swagger2", version = "3.0.0" } -swagger-annotations2 = { module = "io.swagger:swagger-annotations", version = "1.6.14" } -swagger-annotations3 = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.22" } +swagger-annotations2 = { module = "io.swagger:swagger-annotations", version = "1.6.16" } +swagger-annotations3 = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.40" } -testcontainers-junit4-mock = { module = "io.quarkus:quarkus-junit4-mock", version = "3.11.0" } +testcontainers-junit4-mock = { module = "io.quarkus:quarkus-junit4-mock", version = "3.29.3" } diff --git a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt index 5461fbe..0c48edd 100644 --- a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt +++ b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt @@ -17,7 +17,7 @@ class AzuriteContainer(dockerImageName: DockerImageName) : GenericContainer