From f1416ad297e054faa5e4e893bab97f5ac6c5ac88 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:10:46 +0000 Subject: [PATCH 1/3] Update dependency com.google.errorprone:error_prone_core to v2.42.0 --- 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 e6d3ce151365..7aea4863ee25 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" } commons-io = { module = "commons-io:commons-io", version = "2.20.0" } # check whether JDK 26 condition in junitbuild.java-nullability-conventions.gradle.kts can be removed when updating -errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.41.0" } +errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" } fastcsv = { module = "de.siegmar:fastcsv", version = "4.0.0" } groovy = { module = "org.apache.groovy:groovy", version = "5.0.1" } From dd1bbca538b24e9bf0c2a339097f0c65b8b05eaf Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sun, 21 Sep 2025 16:04:06 +0200 Subject: [PATCH 2/3] Allow ErrorProne to run on JDK 26 --- gradle/libs.versions.toml | 3 --- .../junitbuild.java-nullability-conventions.gradle.kts | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7aea4863ee25..2325fac4c29b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,10 +34,7 @@ bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" } checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" } classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.181" } commons-io = { module = "commons-io:commons-io", version = "2.20.0" } - -# check whether JDK 26 condition in junitbuild.java-nullability-conventions.gradle.kts can be removed when updating errorProne-core = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" } - fastcsv = { module = "de.siegmar:fastcsv", version = "4.0.0" } groovy = { module = "org.apache.groovy:groovy", version = "5.0.1" } groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" } diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts index 7cf0249cd005..2bef782b14ed 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts @@ -27,10 +27,7 @@ nullaway { tasks.withType().configureEach { options.errorprone { - val onJ9 = java.toolchain.implementation.orNull == JvmImplementation.J9 - // Workaround for https://github.com/google/error-prone/issues/5200 - val onJdk26 = java.toolchain.languageVersion.get() >= JavaLanguageVersion.of(26) - val shouldDisableErrorProne = onJ9 || onJdk26 + val shouldDisableErrorProne = java.toolchain.implementation.orNull == JvmImplementation.J9 if (name == "compileJava" && !shouldDisableErrorProne) { disable( From 14d6c621f717c49e3a4ba904f7e9f3fb6fc346da Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sun, 21 Sep 2025 16:11:52 +0200 Subject: [PATCH 3/3] Remove obsolete TODO --- gradle/libs.versions.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2325fac4c29b..6f56929605ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,10 +25,7 @@ ant = { module = "org.apache.ant:ant", version.ref = "ant" } ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" } ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" } apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" } - -# check whether the Java condition in platform-tooling-support-tests.gradle.kts can be changed when updating archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.4.1" } - assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" } checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }