From af3421ed33a5e94e58f027157a65aa5e5a1f6fb9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 09:56:49 +0000 Subject: [PATCH 1/3] chore(deps): update gradle to v9 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4f5eb9dcc0e..1e922f4074a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From fbeb2ee185e44d38624fc827ae5a290be94bb5a1 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Tue, 11 Aug 2026 12:38:51 +0200 Subject: [PATCH 2/3] remove gradle deprecations --- .../build.gradle | 7 +- .../build.gradle | 7 +- .../commercetools-graphql-api/build.gradle | 10 +-- .../build.gradle | 2 +- .../commercetools-javanet-client/build.gradle | 5 +- .../commercetools-okhttp-client4/build.gradle | 2 +- .../commercetools-okhttp-client5/build.gradle | 2 +- .../build.gradle | 2 +- .../commercetools-sdk-java-api/build.gradle | 76 ++++++++++--------- .../build.gradle | 10 +-- .../build.gradle | 10 +-- .../build.gradle | 10 +-- commercetools/internal-docs/build.gradle | 5 +- gradle-scripts/extensions.gradle | 65 ---------------- gradle-scripts/publishing.gradle | 8 +- gradle-scripts/subproject-config.gradle | 4 +- gradle-scripts/subproject-dependencies.gradle | 16 ++-- .../index.json | 2 +- .../index.json | 2 +- licenses/commercetools-graphql-api/index.json | 13 ---- licenses/commercetools-http-client/index.json | 2 +- .../commercetools-javanet-client/index.json | 2 +- licenses/index.json | 15 +--- rmf/rmf-java-base/build.gradle | 14 ++-- 24 files changed, 108 insertions(+), 183 deletions(-) diff --git a/commercetools/commercetools-apachehttp-client/build.gradle b/commercetools/commercetools-apachehttp-client/build.gradle index 98551061f9e..16a1307e928 100644 --- a/commercetools/commercetools-apachehttp-client/build.gradle +++ b/commercetools/commercetools-apachehttp-client/build.gradle @@ -6,7 +6,10 @@ dependencies { prefer "5.6.2" } - api commons.io version commons.io_version + api 'commons-io:commons-io:2.22.0' version { + strictly '[2.8.0,)' + prefer '2.22.0' + } - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-async-http-client/build.gradle b/commercetools/commercetools-async-http-client/build.gradle index 149de31580d..53fde42a2a6 100644 --- a/commercetools/commercetools-async-http-client/build.gradle +++ b/commercetools/commercetools-async-http-client/build.gradle @@ -2,11 +2,14 @@ dependencies { api project(":rmf:rmf-java-base") api "org.asynchttpclient:async-http-client:2.16.1" - api commons.io version commons.io_version + api 'commons-io:commons-io:2.22.0' version { + strictly '[2.8.0,)' + prefer '2.22.0' + } api "io.netty:netty-codec:4.2.17.Final" api "io.netty:netty-codec-http:4.2.15.Final" api "io.netty:netty-codec-socks:4.2.17.Final" api "io.netty:netty-handler-proxy:4.2.17.Final" api "io.netty:netty-handler:4.2.17.Final" - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-graphql-api/build.gradle b/commercetools/commercetools-graphql-api/build.gradle index 458e5288491..eee3e363f8c 100644 --- a/commercetools/commercetools-graphql-api/build.gradle +++ b/commercetools/commercetools-graphql-api/build.gradle @@ -30,11 +30,11 @@ artifacts { dependencies { api project(':commercetools:commercetools-sdk-java-api') testImplementation project(':commercetools:commercetools-http-client') - implementation google.findbugs - implementation javax.validation - api graphql.java - api jackson_core.databind - api jackson_core.core + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' + api 'com.graphql-java:graphql-java:19.11' + api 'tools.jackson.core:jackson-databind:3.1.5' + api 'tools.jackson.core:jackson-core:3.2.1' //api jackson_core.datatype api 'com.netflix.graphql.dgs.codegen:graphql-dgs-codegen-shared-core:8.6.0' constraints { diff --git a/commercetools/commercetools-importapi-utils/build.gradle b/commercetools/commercetools-importapi-utils/build.gradle index 21bfc10c60b..5f7d098bb9d 100644 --- a/commercetools/commercetools-importapi-utils/build.gradle +++ b/commercetools/commercetools-importapi-utils/build.gradle @@ -1,5 +1,5 @@ dependencies { implementation(project(":commercetools:commercetools-sdk-java-api")) implementation(project(":commercetools:commercetools-sdk-java-importapi")) - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-javanet-client/build.gradle b/commercetools/commercetools-javanet-client/build.gradle index 70ebecc2278..b015d565f47 100644 --- a/commercetools/commercetools-javanet-client/build.gradle +++ b/commercetools/commercetools-javanet-client/build.gradle @@ -2,7 +2,10 @@ dependencies { api project(":rmf:rmf-java-base") - api commons.io version commons.io_version + api 'commons-io:commons-io:2.22.0' version { + strictly '[2.8.0,)' + prefer '2.22.0' + } } diff --git a/commercetools/commercetools-okhttp-client4/build.gradle b/commercetools/commercetools-okhttp-client4/build.gradle index f5077cf331c..a6e63f13c59 100644 --- a/commercetools/commercetools-okhttp-client4/build.gradle +++ b/commercetools/commercetools-okhttp-client4/build.gradle @@ -17,5 +17,5 @@ dependencies { } implementation "com.squareup.okio:okio:3.18.1" - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-okhttp-client5/build.gradle b/commercetools/commercetools-okhttp-client5/build.gradle index 80e30ee1f8a..8e18e142244 100644 --- a/commercetools/commercetools-okhttp-client5/build.gradle +++ b/commercetools/commercetools-okhttp-client5/build.gradle @@ -17,5 +17,5 @@ dependencies { } implementation "com.squareup.okio:okio:3.18.1" - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-reactornetty-client/build.gradle b/commercetools/commercetools-reactornetty-client/build.gradle index 3a2cc260db5..3dd177b53fa 100644 --- a/commercetools/commercetools-reactornetty-client/build.gradle +++ b/commercetools/commercetools-reactornetty-client/build.gradle @@ -5,5 +5,5 @@ dependencies { api "io.projectreactor.netty:reactor-netty-http:1.3.6" api "io.projectreactor.netty:reactor-netty-core:1.3.6" - implementation javax.validation + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' } diff --git a/commercetools/commercetools-sdk-java-api/build.gradle b/commercetools/commercetools-sdk-java-api/build.gradle index 9319a693646..74e173b8048 100644 --- a/commercetools/commercetools-sdk-java-api/build.gradle +++ b/commercetools/commercetools-sdk-java-api/build.gradle @@ -2,19 +2,23 @@ dependencies { api project(':rmf:rmf-java-base') api project(':commercetools:commercetools-money') - api jackson_core.annotations - api jackson_core.databind - implementation google.findbugs - implementation javax.validation - api slf4j.api - api commons.lang3 + api 'com.fasterxml.jackson.core:jackson-annotations:2.22' + api 'tools.jackson.core:jackson-databind:3.1.5' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' + api 'org.apache.commons:commons-lang3:3.20.0' + api 'org.slf4j:slf4j-api:2.0.18' + api 'org.apache.commons:commons-lang3:3.20.0' testImplementation project(':commercetools:commercetools-http-client') testImplementation project(':commercetools:commercetools-okhttp-client4') testImplementation project(':commercetools:commercetools-apachehttp-client') - testImplementation commons.io version commons.io_version + testImplementation 'commons-io:commons-io:2.22.0' version { + strictly '[2.8.0,)' + prefer '2.22.0' + } - testImplementation google.gson + testImplementation 'com.google.code.gson:gson:2.14.0' } sourceSets.main.java.srcDirs += "src/main/java-generated" @@ -62,9 +66,9 @@ projectDir.toPath().resolve("src/main/java-generated/com/commercetools/api/model artifact modelTask artifact javadocsTask artifact modelSourcesTask - groupId group - artifactId project.name + "-models_$dirname" - version version + groupId = group + artifactId = project.name + "-models_$dirname" + version = version pom { name = project.name + "-models_$dirname" @@ -76,7 +80,7 @@ projectDir.toPath().resolve("src/main/java-generated/com/commercetools/api/model email = "jens.schulze@commercetools.com" } } - url = scmHttpsUrl + url = rootProject.ext.scmHttpsUrl licenses { license { name = "The Apache Software License, Version 2.0" @@ -85,9 +89,9 @@ projectDir.toPath().resolve("src/main/java-generated/com/commercetools/api/model } } scm { - connection = "scm:git:$scmHttpsUrl" - developerConnection = "scm:git:$scmSshUrl" - url = "$scmProjectUrl" + connection = "scm:git:${rootProject.ext.scmHttpsUrl}" + developerConnection = "scm:git:${rootProject.ext.scmSshUrl}" + url = "${rootProject.ext.scmProjectUrl}" } } pom.withXml { @@ -194,9 +198,9 @@ publishing { artifact modelsBaseJar artifact javadocModelsBaseJar artifact sourcesModelsBaseJar - groupId group - artifactId project.name + "-models-base" - version version + groupId = group + artifactId = project.name + "-models-base" + version = version pom { name = project.name + "-models_base" @@ -208,7 +212,7 @@ publishing { email = "jens.schulze@commercetools.com" } } - url = scmHttpsUrl + url = rootProject.ext.scmHttpsUrl licenses { license { name = "The Apache Software License, Version 2.0" @@ -217,9 +221,9 @@ publishing { } } scm { - connection = "scm:git:$scmHttpsUrl" - developerConnection = "scm:git:$scmSshUrl" - url = "$scmProjectUrl" + connection = "scm:git:${rootProject.ext.scmHttpsUrl}" + developerConnection = "scm:git:${rootProject.ext.scmSshUrl}" + url = "${rootProject.ext.scmProjectUrl}" } } pom.withXml { @@ -235,9 +239,9 @@ publishing { artifact baseJar artifact javadocBaseJar artifact sourcesBaseJar - groupId group - artifactId project.name + "-base" - version version + groupId = group + artifactId = project.name + "-base" + version = version pom { name = project.name + "-base" @@ -249,7 +253,7 @@ publishing { email = "jens.schulze@commercetools.com" } } - url = scmHttpsUrl + url = rootProject.ext.scmHttpsUrl licenses { license { name = "The Apache Software License, Version 2.0" @@ -258,9 +262,9 @@ publishing { } } scm { - connection = "scm:git:$scmHttpsUrl" - developerConnection = "scm:git:$scmSshUrl" - url = "$scmProjectUrl" + connection = "scm:git:${rootProject.ext.scmHttpsUrl}" + developerConnection = "scm:git:${rootProject.ext.scmSshUrl}" + url = "${rootProject.ext.scmHttpsUrl}" } } pom.withXml { @@ -311,9 +315,9 @@ publishing { artifact predicatesJar artifact javadocPredicatesJar artifact sourcesPredicatesJar - groupId group - artifactId project.name + "-predicates" - version version + groupId = group + artifactId = project.name + "-predicates" + version = version pom { name = project.name + "-predicates" @@ -325,7 +329,7 @@ publishing { email = "jens.schulze@commercetools.com" } } - url = scmHttpsUrl + url = rootProject.ext.scmHttpsUrl licenses { license { name = "The Apache Software License, Version 2.0" @@ -334,9 +338,9 @@ publishing { } } scm { - connection = "scm:git:$scmHttpsUrl" - developerConnection = "scm:git:$scmSshUrl" - url = "$scmProjectUrl" + connection = "scm:git:${rootProject.ext.scmHttpsUrl}" + developerConnection = "scm:git:${rootProject.ext.scmSshUrl}" + url = "${rootProject.ext.scmProjectUrl}" } } pom.withXml { diff --git a/commercetools/commercetools-sdk-java-checkout/build.gradle b/commercetools/commercetools-sdk-java-checkout/build.gradle index 78891910716..fb0b22bcfdc 100644 --- a/commercetools/commercetools-sdk-java-checkout/build.gradle +++ b/commercetools/commercetools-sdk-java-checkout/build.gradle @@ -1,11 +1,11 @@ dependencies { api project(':rmf:rmf-java-base') - api jackson_core.annotations - api jackson_core.databind - implementation google.findbugs - implementation javax.validation - api commons.lang3 + api 'com.fasterxml.jackson.core:jackson-annotations:2.22' + api 'tools.jackson.core:jackson-databind:3.1.5' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' + api 'org.apache.commons:commons-lang3:3.20.0' integrationTestImplementation project(':commercetools:commercetools-http-client') integrationTestImplementation project(':commercetools:commercetools-sdk-java-api') diff --git a/commercetools/commercetools-sdk-java-history/build.gradle b/commercetools/commercetools-sdk-java-history/build.gradle index 60679ddd4d1..296ee71bb28 100644 --- a/commercetools/commercetools-sdk-java-history/build.gradle +++ b/commercetools/commercetools-sdk-java-history/build.gradle @@ -1,11 +1,11 @@ dependencies { api project(':rmf:rmf-java-base') - api jackson_core.annotations - api jackson_core.databind - implementation google.findbugs - implementation javax.validation - api commons.lang3 + api 'com.fasterxml.jackson.core:jackson-annotations:2.22' + api 'tools.jackson.core:jackson-databind:3.1.5' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' + api 'org.apache.commons:commons-lang3:3.20.0' integrationTestImplementation project(':commercetools:commercetools-http-client') } diff --git a/commercetools/commercetools-sdk-java-importapi/build.gradle b/commercetools/commercetools-sdk-java-importapi/build.gradle index 78891910716..fb0b22bcfdc 100644 --- a/commercetools/commercetools-sdk-java-importapi/build.gradle +++ b/commercetools/commercetools-sdk-java-importapi/build.gradle @@ -1,11 +1,11 @@ dependencies { api project(':rmf:rmf-java-base') - api jackson_core.annotations - api jackson_core.databind - implementation google.findbugs - implementation javax.validation - api commons.lang3 + api 'com.fasterxml.jackson.core:jackson-annotations:2.22' + api 'tools.jackson.core:jackson-databind:3.1.5' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.1' + api 'org.apache.commons:commons-lang3:3.20.0' integrationTestImplementation project(':commercetools:commercetools-http-client') integrationTestImplementation project(':commercetools:commercetools-sdk-java-api') diff --git a/commercetools/internal-docs/build.gradle b/commercetools/internal-docs/build.gradle index 1c8a2ee40bc..3c80bf9a196 100644 --- a/commercetools/internal-docs/build.gradle +++ b/commercetools/internal-docs/build.gradle @@ -30,7 +30,10 @@ dependencies { testImplementation 'com.commercetools.sdk.jvm.core:commercetools-java-client:2.16.0' testImplementation project(":commercetools:commercetools-javanet-client") - testImplementation commons.io version commons.io_version + testImplementation 'commons-io:commons-io:2.22.0' version { + strictly '[2.8.0,)' + prefer '2.22.0' + } } diff --git a/gradle-scripts/extensions.gradle b/gradle-scripts/extensions.gradle index 189f2744688..23de2d813f1 100644 --- a/gradle-scripts/extensions.gradle +++ b/gradle-scripts/extensions.gradle @@ -9,71 +9,6 @@ ext { } ] - commons = [ - lang3version: '3.17.0', - text: 'org.apache.commons:commons-text:1.15.0', - lang3: 'org.apache.commons:commons-lang3:3.20.0', - io: 'commons-io:commons-io:2.22.0', - io_version: { - strictly '[2.8.0,)' - prefer '2.16.1' - } - ] - - slf4j = [ - version: '2.0.17', - api: 'org.slf4j:slf4j-api:2.0.18', - ] - - logback = [ - classic: 'ch.qos.logback:logback-classic:1.3.15', - ] - - jackson_core = [ - version: '3.1.0', - annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.22', - databind: 'tools.jackson.core:jackson-databind:3.1.5', - core: 'tools.jackson.core:jackson-core:3.2.1', - //datatype: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:3.1.0', - ] - - google = [ - findbugsversion: '3.0.2', - findbugs: 'com.google.code.findbugs:jsr305:3.0.2', - gson: 'com.google.code.gson:gson:2.14.0', - ] - - graphql = [ - java: 'com.graphql-java:graphql-java:19.11' - ] - awaitility = [ - awaitility: 'org.awaitility:awaitility:4.3.0', - ] - - javax = [ - validationVersion: '3.1.1', - validation: 'jakarta.validation:jakarta.validation-api:3.1.1', - ] - - junit = [ - junit: 'org.junit.jupiter:junit-jupiter:6.1.3', - jsonassert: 'org.skyscreamer:jsonassert:1.5.3', - assertj: 'org.assertj:assertj-core:3.27.7' - ] - - mockito = [ - inline: 'org.mockito:mockito-inline:5.2.0', - junit: 'org.mockito:mockito-junit-jupiter:5.23.0', - ] - - failsafe = [ - failsafe: 'dev.failsafe:failsafe:3.3.2', - ] - - spotify = [ - completableFutures: "com.spotify:completable-futures:0.3.6" - ] - scmProjectName = rootProject.name scmRepo = 'github.com' scmProjectPath = "commercetools/commercetools-sdk-java-v2.git" // github relative path with .git extension diff --git a/gradle-scripts/publishing.gradle b/gradle-scripts/publishing.gradle index bd6c8879bea..8cef84bf903 100644 --- a/gradle-scripts/publishing.gradle +++ b/gradle-scripts/publishing.gradle @@ -50,9 +50,9 @@ subprojects { project -> from components.java artifact sourcesJar artifact javadocJar - groupId group - artifactId project.name - version version + groupId = group + artifactId = project.name + version = version pom { name = project.name @@ -64,7 +64,7 @@ subprojects { project -> email = "jens.schulze@commercetools.com" } } - url = scmHttpsUrl + url = rootProject.ext.scmHttpsUrl } pom.withXml { def root = asNode() diff --git a/gradle-scripts/subproject-config.gradle b/gradle-scripts/subproject-config.gradle index 600e09d8e89..7619b183598 100644 --- a/gradle-scripts/subproject-config.gradle +++ b/gradle-scripts/subproject-config.gradle @@ -70,11 +70,11 @@ tasks.register('integrationTest', Test) { testLogging { events "failed" - exceptionFormat "full" + exceptionFormat = "full" info { events "failed" - exceptionFormat "full" + exceptionFormat = "full" } } } diff --git a/gradle-scripts/subproject-dependencies.gradle b/gradle-scripts/subproject-dependencies.gradle index 8d9186d7413..a11f5ef0f8f 100644 --- a/gradle-scripts/subproject-dependencies.gradle +++ b/gradle-scripts/subproject-dependencies.gradle @@ -1,12 +1,12 @@ dependencies { - testImplementation junit.junit - testImplementation junit.assertj - testImplementation awaitility.awaitility - testImplementation logback.classic - testImplementation junit.jsonassert - testImplementation google.gson - testImplementation mockito.inline - testImplementation mockito.junit + testImplementation 'org.junit.jupiter:junit-jupiter:6.1.3' + testImplementation 'org.assertj:assertj-core:3.27.7' + testImplementation 'org.awaitility:awaitility:4.3.0' + testImplementation 'ch.qos.logback:logback-classic:1.3.15' + testImplementation 'org.skyscreamer:jsonassert:1.5.3' + testImplementation 'com.google.code.gson:gson:2.14.0' + testImplementation 'org.mockito:mockito-inline:5.2.0' + testImplementation 'org.mockito:mockito-junit-jupiter:5.23.0' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'com.vdurmont:semver4j:3.1.0' } diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json index 6b557254ce8..cf240df1939 100644 --- a/licenses/commercetools-apachehttp-client/index.json +++ b/licenses/commercetools-apachehttp-client/index.json @@ -41,7 +41,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.16.1", + "moduleVersion": "2.22.0", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json index fa1bba7d30e..caf365519df 100644 --- a/licenses/commercetools-async-http-client/index.json +++ b/licenses/commercetools-async-http-client/index.json @@ -79,7 +79,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.16.1", + "moduleVersion": "2.22.0", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/commercetools-graphql-api/index.json b/licenses/commercetools-graphql-api/index.json index f5b3c988378..512f6e0f03d 100644 --- a/licenses/commercetools-graphql-api/index.json +++ b/licenses/commercetools-graphql-api/index.json @@ -95,19 +95,6 @@ } ] }, - { - "moduleName": "com.netflix.graphql.dgs:graphql-dgs-platform", - "moduleVersion": "10.0.4", - "moduleUrls": [ - "https://github.com/Netflix/dgs-framework" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies", "moduleVersion": "10.0.4", diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json index fa1bba7d30e..caf365519df 100644 --- a/licenses/commercetools-http-client/index.json +++ b/licenses/commercetools-http-client/index.json @@ -79,7 +79,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.16.1", + "moduleVersion": "2.22.0", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json index b6d27ff4778..7af26fae970 100644 --- a/licenses/commercetools-javanet-client/index.json +++ b/licenses/commercetools-javanet-client/index.json @@ -41,7 +41,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.16.1", + "moduleVersion": "2.22.0", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/licenses/index.json b/licenses/index.json index e422e1a3489..d1b492eda8d 100644 --- a/licenses/index.json +++ b/licenses/index.json @@ -305,19 +305,6 @@ } ] }, - { - "moduleName": "com.netflix.graphql.dgs:graphql-dgs-platform", - "moduleVersion": "10.0.4", - "moduleUrls": [ - "https://github.com/Netflix/dgs-framework" - ], - "moduleLicenses": [ - { - "moduleLicense": "Apache License, Version 2.0", - "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" - } - ] - }, { "moduleName": "com.netflix.graphql.dgs:graphql-dgs-platform-dependencies", "moduleVersion": "10.0.4", @@ -487,7 +474,7 @@ }, { "moduleName": "commons-io:commons-io", - "moduleVersion": "2.16.1", + "moduleVersion": "2.22.0", "moduleUrls": [ "https://commons.apache.org/proper/commons-io/" ], diff --git a/rmf/rmf-java-base/build.gradle b/rmf/rmf-java-base/build.gradle index 3609783a156..fd557f8a394 100644 --- a/rmf/rmf-java-base/build.gradle +++ b/rmf/rmf-java-base/build.gradle @@ -1,13 +1,13 @@ dependencies { - implementation google.findbugs - api jackson_core.databind - api jackson_core.core + implementation 'com.google.code.findbugs:jsr305:3.0.2' + api 'tools.jackson.core:jackson-databind:3.1.5' + api 'tools.jackson.core:jackson-core:3.2.1' // api jackson_core.datatype - api commons.lang3 - api slf4j.api - api failsafe.failsafe - api spotify.completableFutures + api 'org.apache.commons:commons-lang3:3.20.0' + api 'org.slf4j:slf4j-api:2.0.18' + api 'dev.failsafe:failsafe:3.3.2' + api "com.spotify:completable-futures:0.3.6" api "org.reflections:reflections:0.10.2" } From c979188f5e24264d42e43886c08a644fcd859107 Mon Sep 17 00:00:00 2001 From: Jens Schulze Date: Tue, 11 Aug 2026 12:44:29 +0200 Subject: [PATCH 3/3] fix failing code coverage --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 54c7f18a8c9..c667b855bc9 100644 --- a/build.gradle +++ b/build.gradle @@ -136,6 +136,7 @@ subprojects { project -> javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) } + failOnNoDiscoveredTests = false jvmArgs '-Djdk.tracePinnedThreads=full' } }