diff --git a/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml b/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml new file mode 100644 index 000000000000..ecf824ce90bb --- /dev/null +++ b/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml @@ -0,0 +1,7 @@ +title: Update com.github.ben-manes.caffeine:caffeine to v3.2.3 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4313 + url: https://github.com/apache/solr/pull/4313 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.3.jar.sha1 b/solr/licenses/caffeine-3.2.3.jar.sha1 new file mode 100644 index 000000000000..29f1c69cf626 --- /dev/null +++ b/solr/licenses/caffeine-3.2.3.jar.sha1 @@ -0,0 +1 @@ +c097f0f6d21a0e6db88ea55836e26419b30dfe19 diff --git a/solr/modules/hdfs/build.gradle b/solr/modules/hdfs/build.gradle index 221c2bc6f038..0803e477c500 100644 --- a/solr/modules/hdfs/build.gradle +++ b/solr/modules/hdfs/build.gradle @@ -34,7 +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' + implementation('com.github.ben-manes.caffeine:caffeine') { transitive = false } implementation 'commons-cli:commons-cli' diff --git a/versions.lock b/versions.lock index 4d56b7387910..73f02e02e4fd 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.1.8 (2 constraints: 1112b117) +com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) 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.11.0 (7 constraints: f462d514) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 72cf7ec0) +com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 75cff4c6) com.google.guava:failureaccess:1.0.2 (2 constraints: fb19bf37) com.google.guava:guava:33.1.0-jre (24 constraints: 716c78d6) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) @@ -268,7 +268,7 @@ org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36) 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.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) @@ -317,7 +317,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) -org.jspecify:jspecify:1.0.0 (1 constraints: a909f5a9) +org.jspecify:jspecify:1.0.0 (2 constraints: 9f194a28) 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 ecd3c45bc4b5..d03fde39c904 100644 --- a/versions.props +++ b/versions.props @@ -7,7 +7,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.3 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0