From 231e1b50acbc24e3738c414ada842056a38b1137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 29 Aug 2025 20:09:55 +0200 Subject: [PATCH] Restrict errorprone to max 2.31.0 which supports JDK11 Also prevent renovate from filing new PRs for it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Høydahl --- .github/renovate.json | 9 ++++++++- gradle/validation/error-prone.gradle | 12 ++++++++++++ versions.props | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 6859a96c7ac..12dd2eaa1fb 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -10,5 +10,12 @@ "prConcurrentLimit": 100, "prHourlyLimit": 10, "branchPrefix": "renovate-9x/", - "commitMessageSuffix": " (branch_9x)" + "commitMessageSuffix": " (branch_9x)", + "packageRules": [ + { + "description": "Skip errorprone upgrades since newer versions require JDK17", + "matchPackagePrefixes": ["com.google.errorprone"], + "enabled": false + } + ] } diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle index 647ebdeb4fb..97311445468 100644 --- a/gradle/validation/error-prone.gradle +++ b/gradle/validation/error-prone.gradle @@ -35,6 +35,18 @@ if (skipReason) { } } +configurations.all { + resolutionStrategy { + eachDependency { details -> + if (details.requested.group == "com.google.errorprone" && + (details.requested.name == "error_prone_core" || details.requested.name == "error_prone_annotations")) { + details.useVersion("2.31.0") + details.because("Lock Error Prone dependencies to 2.31.0 to prevent accidental upgrades") + } + } + } +} + allprojects { prj -> plugins.withType(JavaPlugin) { // LUCENE-9650: Errorprone on master/gradle does not work when running as plugin diff --git a/versions.props b/versions.props index 55ac9addbbd..f84848bad2f 100644 --- a/versions.props +++ b/versions.props @@ -10,6 +10,7 @@ com.github.ben-manes.caffeine:caffeine=3.1.8 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0 +# Errorprone must stay on 2.31.0 on 9.x to play nice with JDK11 com.google.errorprone:*=2.31.0 com.google.guava:guava=32.1.3-jre com.google.protobuf:*=3.25.8