From b298c5de056f809aed71fc5cc85fe426e78987c0 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 29 Aug 2025 13:20:44 +0000 Subject: [PATCH 1/5] Update dependency com.github.ben-manes.caffeine:caffeine to v3.2.2 (branch_9x) --- solr/licenses/caffeine-3.1.8.jar.sha1 | 1 - solr/licenses/caffeine-3.2.2.jar.sha1 | 1 + solr/licenses/error_prone_annotations-2.31.0.jar.sha1 | 1 - solr/licenses/error_prone_annotations-2.40.0.jar.sha1 | 1 + solr/licenses/jspecify-1.0.0.jar.sha1 | 1 + versions.lock | 7 ++++--- versions.props | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 solr/licenses/caffeine-3.1.8.jar.sha1 create mode 100644 solr/licenses/caffeine-3.2.2.jar.sha1 delete mode 100644 solr/licenses/error_prone_annotations-2.31.0.jar.sha1 create mode 100644 solr/licenses/error_prone_annotations-2.40.0.jar.sha1 create mode 100644 solr/licenses/jspecify-1.0.0.jar.sha1 diff --git a/solr/licenses/caffeine-3.1.8.jar.sha1 b/solr/licenses/caffeine-3.1.8.jar.sha1 deleted file mode 100644 index 15ff311e9793..000000000000 --- a/solr/licenses/caffeine-3.1.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24795585df8afaf70a2cd534786904ea5889c047 diff --git a/solr/licenses/caffeine-3.2.2.jar.sha1 b/solr/licenses/caffeine-3.2.2.jar.sha1 new file mode 100644 index 000000000000..ba23d518426f --- /dev/null +++ b/solr/licenses/caffeine-3.2.2.jar.sha1 @@ -0,0 +1 @@ +8b0a31cb57ac00e18161d5586759912bd2637398 diff --git a/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 deleted file mode 100644 index 1fa88710c6dd..000000000000 --- a/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3ba307b915d6d506e98ffbb49e6d2d12edad65b diff --git a/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 new file mode 100644 index 000000000000..304f8a8b3582 --- /dev/null +++ b/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 @@ -0,0 +1 @@ +81bd85ecc769f008241fa841159c3e1caa08deab diff --git a/solr/licenses/jspecify-1.0.0.jar.sha1 b/solr/licenses/jspecify-1.0.0.jar.sha1 new file mode 100644 index 000000000000..6a8a9a9d37c7 --- /dev/null +++ b/solr/licenses/jspecify-1.0.0.jar.sha1 @@ -0,0 +1 @@ +7425a601c1c7ec76645a78d22b8c6a627edee507 diff --git a/versions.lock b/versions.lock index 01a44605c900..c8d58a0ba99d 100644 --- a/versions.lock +++ b/versions.lock @@ -17,7 +17,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e358 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ac2419e1) com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) com.fasterxml.woodstox:woodstox-core:7.0.0 (2 constraints: 9b23d883) -com.github.ben-manes.caffeine:caffeine:3.1.8 (2 constraints: 1112b117) +com.github.ben-manes.caffeine:caffeine:3.2.2 (2 constraints: 0c12eb16) com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01) com.github.junrar:junrar:7.5.3 (1 constraints: 660c1102) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) @@ -46,7 +46,7 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) com.google.code.gson:gson:2.11.0 (8 constraints: 566fc864) -com.google.errorprone:error_prone_annotations:2.31.0 (15 constraints: a5c51259) +com.google.errorprone:error_prone_annotations:2.40.0 (15 constraints: a5c51659) com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37) com.google.guava:guava:33.1.0-jre (26 constraints: 0280374a) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) @@ -319,7 +319,7 @@ org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36) org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e) org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300) org.ccil.cowan.tagsoup:tagsoup:1.2.1 (1 constraints: 5b0ce801) -org.checkerframework:checker-qual:3.44.0 (5 constraints: 6c46e5ef) +org.checkerframework:checker-qual:3.44.0 (4 constraints: 3a36c0ef) org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319) org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a) org.codehaus.woodstox:stax2-api:4.2.2 (2 constraints: 38155daf) @@ -376,6 +376,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.10 (4 constraints: 5c405537) org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 (3 constraints: 3a2c8a72) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 49773549) +org.jspecify:jspecify:1.0.0 (1 constraints: f70f549f) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) diff --git a/versions.props b/versions.props index 55ac9addbbd6..3a23c05d8bae 100644 --- a/versions.props +++ b/versions.props @@ -6,7 +6,7 @@ com.carrotsearch.randomizedtesting:*=2.8.3 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 com.fasterxml.jackson:jackson-bom=2.18.0 -com.github.ben-manes.caffeine:caffeine=3.1.8 +com.github.ben-manes.caffeine:caffeine=3.2.2 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0 From 216caae193eba5460277e48690fd343daebee0a7 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 2/5] 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 6859a96c7acc..12dd2eaa1fb7 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 647ebdeb4fb4..973114454683 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 3a23c05d8bae..013eb7ef416f 100644 --- a/versions.props +++ b/versions.props @@ -10,6 +10,7 @@ com.github.ben-manes.caffeine:caffeine=3.2.2 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 From 4880b51acc9accfdc6333f967a02c64324c9d026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 29 Aug 2025 21:12:46 +0200 Subject: [PATCH 3/5] Update lock file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Høydahl --- versions.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.lock b/versions.lock index c8d58a0ba99d..3fb88dd341fe 100644 --- a/versions.lock +++ b/versions.lock @@ -46,7 +46,7 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) com.google.code.gson:gson:2.11.0 (8 constraints: 566fc864) -com.google.errorprone:error_prone_annotations:2.40.0 (15 constraints: a5c51659) +com.google.errorprone:error_prone_annotations:2.31.0 (15 constraints: a5c51659) com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37) com.google.guava:guava:33.1.0-jre (26 constraints: 0280374a) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) From c4a732ac786ef27b9af9490d27a1fcb9194f8e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 29 Aug 2025 21:18:48 +0200 Subject: [PATCH 4/5] Exclude errorprone from caffeine dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Høydahl --- solr/licenses/error_prone_annotations-2.31.0.jar.sha1 | 1 + solr/licenses/error_prone_annotations-2.40.0.jar.sha1 | 1 - solr/modules/hdfs/build.gradle | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 solr/licenses/error_prone_annotations-2.31.0.jar.sha1 delete mode 100644 solr/licenses/error_prone_annotations-2.40.0.jar.sha1 diff --git a/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 new file mode 100644 index 000000000000..1fa88710c6dd --- /dev/null +++ b/solr/licenses/error_prone_annotations-2.31.0.jar.sha1 @@ -0,0 +1 @@ +c3ba307b915d6d506e98ffbb49e6d2d12edad65b diff --git a/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 b/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 deleted file mode 100644 index 304f8a8b3582..000000000000 --- a/solr/licenses/error_prone_annotations-2.40.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81bd85ecc769f008241fa841159c3e1caa08deab diff --git a/solr/modules/hdfs/build.gradle b/solr/modules/hdfs/build.gradle index 221c2bc6f038..179a31f91429 100644 --- a/solr/modules/hdfs/build.gradle +++ b/solr/modules/hdfs/build.gradle @@ -34,7 +34,9 @@ dependencies { implementation 'com.google.guava:guava' implementation 'io.dropwizard.metrics:metrics-core' // Caffeine cache to implement HDFS block caching - implementation 'com.github.ben-manes.caffeine:caffeine' + implementation('com.github.ben-manes.caffeine:caffeine') { + exclude group: 'com.google.errorprone' + } implementation 'commons-cli:commons-cli' From a3004cd63c0bbab3619e2b749ca677a63aebbb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 29 Aug 2025 21:21:27 +0200 Subject: [PATCH 5/5] Use transitive=false instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Høydahl --- solr/modules/hdfs/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/solr/modules/hdfs/build.gradle b/solr/modules/hdfs/build.gradle index 179a31f91429..0803e477c500 100644 --- a/solr/modules/hdfs/build.gradle +++ b/solr/modules/hdfs/build.gradle @@ -34,9 +34,7 @@ dependencies { implementation 'com.google.guava:guava' implementation 'io.dropwizard.metrics:metrics-core' // Caffeine cache to implement HDFS block caching - implementation('com.github.ben-manes.caffeine:caffeine') { - exclude group: 'com.google.errorprone' - } + implementation('com.github.ben-manes.caffeine:caffeine') { transitive = false } implementation 'commons-cli:commons-cli'