From 19cae9dcd1703dfe87b55c77367c6ec855f04dec Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 3 May 2026 02:10:34 +0000 Subject: [PATCH 1/2] Update dependency com.github.ben-manes.caffeine:caffeine to v3.2.4 (branch_9x) --- solr/licenses/caffeine-3.2.3.jar.sha1 | 1 - solr/licenses/caffeine-3.2.4.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 solr/licenses/caffeine-3.2.3.jar.sha1 create mode 100644 solr/licenses/caffeine-3.2.4.jar.sha1 diff --git a/solr/licenses/caffeine-3.2.3.jar.sha1 b/solr/licenses/caffeine-3.2.3.jar.sha1 deleted file mode 100644 index 29f1c69cf626..000000000000 --- a/solr/licenses/caffeine-3.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c097f0f6d21a0e6db88ea55836e26419b30dfe19 diff --git a/solr/licenses/caffeine-3.2.4.jar.sha1 b/solr/licenses/caffeine-3.2.4.jar.sha1 new file mode 100644 index 000000000000..d35655611e70 --- /dev/null +++ b/solr/licenses/caffeine-3.2.4.jar.sha1 @@ -0,0 +1 @@ +c63b303adf59c733d2a96125ad6670e938a2c15d diff --git a/versions.lock b/versions.lock index 659611f7d411..d9d0921e4d3f 100644 --- a/versions.lock +++ b/versions.lock @@ -15,7 +15,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: ab241ae1) com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) com.fasterxml.woodstox:woodstox-core:7.0.0 (1 constraints: 3b174526) -com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) +com.github.ben-manes.caffeine:caffeine:3.2.4 (2 constraints: 0e123b17) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87) @@ -41,7 +41,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.12.1 (7 constraints: f6622515) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 87cf47ce) +com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 8dcf2bdb) com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) diff --git a/versions.props b/versions.props index 9696656c75ea..b09ffb6ee7eb 100644 --- a/versions.props +++ b/versions.props @@ -7,7 +7,7 @@ com.carrotsearch.randomizedtesting:*=2.8.4 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.2.3 +com.github.ben-manes.caffeine:caffeine=3.2.4 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 eeffaf3165eaa5d86c67da193600c7979c7735f8 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 3 May 2026 02:10:55 +0000 Subject: [PATCH 2/2] Update changelog entry --- ...#4390-update-com-github-ben-manes-caffeine-caffeine.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml diff --git a/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml b/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml new file mode 100644 index 000000000000..0e1fba21a681 --- /dev/null +++ b/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml @@ -0,0 +1,7 @@ +title: Update com.github.ben-manes.caffeine:caffeine to v3.2.4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4390 + url: https://github.com/apache/solr/pull/4390