SOLR-16562: Upgrade to Caffeine 3.1.2

apache · Dec 7, 2022 · 8f0cd0e · 8f0cd0e
1 parent 052304f
commit 8f0cd0e
Show file tree

Hide file tree

Showing 28 changed files with 37 additions and 35 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -166,6 +166,8 @@ Other Changes
 
 * SOLR-16579: Upgrade Jackson to 2.14.1 (Kevin Risden)
 
+* SOLR-16562: Upgrade to Caffeine 3.1.2 (Kevin Risden)
+
 ==================  9.1.0 ==================
 
 New Features

diff --git a/solr/licenses/asm-9.3.jar.sha1 b/solr/licenses/asm-9.3.jar.sha1
diff --git a/solr/licenses/asm-9.4.jar.sha1 b/solr/licenses/asm-9.4.jar.sha1
@@ -0,0 +1 @@
+b4e0e2d2e023aa317b7cfcfc916377ea348e07d1
diff --git a/solr/licenses/asm-analysis-7.2.jar.sha1 b/solr/licenses/asm-analysis-7.2.jar.sha1
diff --git a/solr/licenses/asm-commons-7.2.jar.sha1 b/solr/licenses/asm-commons-7.2.jar.sha1
diff --git a/solr/licenses/asm-commons-9.4.jar.sha1 b/solr/licenses/asm-commons-9.4.jar.sha1
@@ -0,0 +1 @@
+8fc2810ddbcbbec0a8bbccb3f8eda58321839912
diff --git a/solr/licenses/asm-tree-7.2.jar.sha1 b/solr/licenses/asm-tree-7.2.jar.sha1
diff --git a/solr/licenses/asm-tree-9.4.jar.sha1 b/solr/licenses/asm-tree-9.4.jar.sha1
@@ -0,0 +1 @@
+a99175a17d7fdc18cbcbd0e8ea6a5d276844190a
diff --git a/solr/licenses/caffeine-3.1.1.jar.sha1 b/solr/licenses/caffeine-3.1.1.jar.sha1
diff --git a/solr/licenses/caffeine-3.1.2.jar.sha1 b/solr/licenses/caffeine-3.1.2.jar.sha1
@@ -0,0 +1 @@
+c79828183e8bfa014cf3287b1aa5200cba18091b
diff --git a/solr/licenses/checker-qual-3.23.0.jar.sha1 b/solr/licenses/checker-qual-3.23.0.jar.sha1
diff --git a/solr/licenses/checker-qual-3.27.0.jar.sha1 b/solr/licenses/checker-qual-3.27.0.jar.sha1
@@ -0,0 +1 @@
+331f93a364f95a05888419b4e138d27cd774206a
diff --git a/solr/licenses/kotlin-reflect-1.6.10.jar.sha1 b/solr/licenses/kotlin-reflect-1.6.10.jar.sha1
diff --git a/solr/licenses/kotlin-reflect-1.7.21.jar.sha1 b/solr/licenses/kotlin-reflect-1.7.21.jar.sha1
@@ -0,0 +1 @@
+0ad6d09bc4db0eab1069112eea8ebea0be7be44f
diff --git a/solr/licenses/kotlin-stdlib-1.6.10.jar.sha1 b/solr/licenses/kotlin-stdlib-1.6.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-1.7.21.jar.sha1 b/solr/licenses/kotlin-stdlib-1.7.21.jar.sha1
@@ -0,0 +1 @@
+1a2eaf898a0dda83037034b10a42053cf8a7caf8
diff --git a/solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.6.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.7.21.jar.sha1
@@ -0,0 +1 @@
+cb02257de8e13e8498f8e2f69f742f2d438e794d
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.6.0.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.7.21.jar.sha1
@@ -0,0 +1 @@
+a0ba09615c2213d580315e234b3febfea25b757e
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.6.0.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.7.21.jar.sha1
@@ -0,0 +1 @@
+5407c3593c58860cec5ee3f66c468396b42f4c2b
diff --git a/solr/licenses/protobuf-java-3.21.4.jar.sha1 b/solr/licenses/protobuf-java-3.21.4.jar.sha1
diff --git a/solr/licenses/protobuf-java-3.21.8.jar.sha1 b/solr/licenses/protobuf-java-3.21.8.jar.sha1
@@ -0,0 +1 @@
+2a1eebb74b844d9ccdf1d22eb2f57cec709698a9
diff --git a/solr/licenses/snakeyaml-1.28.jar.sha1 b/solr/licenses/snakeyaml-1.28.jar.sha1
diff --git a/solr/licenses/snakeyaml-1.33.jar.sha1 b/solr/licenses/snakeyaml-1.33.jar.sha1
@@ -0,0 +1 @@
+2cd0a87ff7df953f810c344bdf2fe3340b954c69
diff --git a/versions.lock b/versions.lock
@@ -1,19 +1,19 @@
 # Run ./gradlew --write-locks to regenerate this file
 biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 (1 constraints: 0c051336)
 com.adobe.xmp:xmpcore:6.1.10 (1 constraints: fd0d5947)
-com.beust:jcommander:1.82 (2 constraints: 2b123714)
+com.beust:jcommander:1.82 (3 constraints: fd21d419)
 com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
 com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1 (2 constraints: cf1501e2)
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
-com.fasterxml.jackson:jackson-bom:2.14.1 (12 constraints: 36f86334)
+com.fasterxml.jackson:jackson-bom:2.14.1 (13 constraints: 7208a870)
 com.fasterxml.jackson.core:jackson-annotations:2.14.1 (10 constraints: 89beae04)
 com.fasterxml.jackson.core:jackson-core:2.14.1 (13 constraints: 2a028008)
 com.fasterxml.jackson.core:jackson-databind:2.14.1 (18 constraints: c863ae0d)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.14.1 (1 constraints: b80ea766)
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.1 (2 constraints: a42445e0)
 com.fasterxml.woodstox:woodstox-core:6.4.0 (3 constraints: af28dcb7)
-com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
+com.github.ben-manes.caffeine:caffeine:3.1.2 (1 constraints: 0805ff35)
 com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
 com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
 com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
@@ -34,7 +34,7 @@ com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
 com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
 com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
 com.google.code.gson:gson:2.9.1 (6 constraints: d958afbf)
-com.google.errorprone:error_prone_annotations:2.16 (4 constraints: 8a38f11d)
+com.google.errorprone:error_prone_annotations:2.16 (4 constraints: 2e389ad2)
 com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
 com.google.guava:guava:31.1-jre (19 constraints: 5d28985f)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
@@ -45,7 +45,7 @@ com.google.http-client:google-http-client-gson:1.42.2 (6 constraints: e6619899)
 com.google.http-client:google-http-client-jackson2:1.42.2 (1 constraints: 1d1003a6)
 com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
 com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.21.4 (9 constraints: 3183ce88)
+com.google.protobuf:protobuf-java:3.21.8 (10 constraints: 649360d7)
 com.google.protobuf:protobuf-java-util:3.21.4 (3 constraints: 332b642b)
 com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
 com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
@@ -134,7 +134,7 @@ org.apache.commons:commons-csv:1.9.0 (1 constraints: 610cfc01)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
 org.apache.commons:commons-lang3:3.12.0 (5 constraints: 9b3e0e36)
 org.apache.commons:commons-math3:3.6.1 (4 constraints: 93247039)
-org.apache.commons:commons-text:1.10.0 (2 constraints: 861680f8)
+org.apache.commons:commons-text:1.10.0 (3 constraints: ad262ca9)
 org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)
 org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)
 org.apache.curator:curator-recipes:4.3.0 (1 constraints: 09050836)
@@ -144,7 +144,7 @@ org.apache.hadoop:hadoop-client-api:3.3.4 (3 constraints: 1f28da5f)
 org.apache.hadoop:hadoop-client-runtime:3.3.4 (2 constraints: 6b177043)
 org.apache.hadoop:hadoop-common:3.3.4 (1 constraints: 0c050736)
 org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
-org.apache.httpcomponents:httpclient:4.5.13 (9 constraints: 5d801b3e)
+org.apache.httpcomponents:httpclient:4.5.13 (10 constraints: 8f9027a9)
 org.apache.httpcomponents:httpcore:4.4.15 (8 constraints: 1c6d2913)
 org.apache.httpcomponents:httpmime:4.5.13 (3 constraints: ea1bb9dc)
 org.apache.httpcomponents.client5:httpclient5:5.1.3 (1 constraints: 6c10bcb3)
@@ -219,15 +219,15 @@ org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
 org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936)
 org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
 org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: ce1b11b3)
-org.bouncycastle:bcprov-jdk15on:1.70 (4 constraints: 1f34ee12)
+org.bouncycastle:bcprov-jdk15on:1.70 (5 constraints: ee43a815)
 org.bouncycastle:bcutil-jdk15on:1.70 (2 constraints: 961ad454)
 org.brotli:dec:0.1.2 (1 constraints: 5a0ce101)
 org.carrot2:carrot2-core:4.5.0 (1 constraints: 0b050e36)
 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.23.0 (5 constraints: 524636e8)
+org.checkerframework:checker-qual:3.27.0 (5 constraints: 574674eb)
 org.codehaus.janino:commons-compiler:3.1.8 (2 constraints: 2f1983ec)
 org.codehaus.janino:janino:3.1.8 (1 constraints: 640dbc2c)
 org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf)
@@ -280,9 +280,10 @@ org.javassist:javassist:3.25.0-GA (1 constraints: 2a110ef1)
 org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)
 org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
 org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (6 constraints: b456d578)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 (3 constraints: 852a7097)
-org.junit:junit-bom:5.9.0 (1 constraints: c7116dde)
+org.jetbrains.kotlin:kotlin-bom:1.7.21 (1 constraints: 31109caf)
+org.jetbrains.kotlin:kotlin-stdlib:1.7.21 (7 constraints: 1e659044)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21 (4 constraints: 873864a4)
+org.junit:junit-bom:5.9.1 (2 constraints: cb21f18e)
 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.1.5 (1 constraints: 5f0daf2c)
@@ -292,10 +293,10 @@ org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
 org.osgi:org.osgi.resource:1.0.0 (1 constraints: e60f2999)
 org.osgi:org.osgi.service.serviceloader:1.0.0 (1 constraints: e60f2999)
 org.osgi:osgi.annotation:8.1.0 (1 constraints: 0b051636)
-org.ow2.asm:asm:9.3 (5 constraints: e139bef1)
-org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)
-org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
-org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)
+org.ow2.asm:asm:9.4 (6 constraints: 1242e83d)
+org.ow2.asm:asm-bom:9.4 (1 constraints: a50fb27f)
+org.ow2.asm:asm-commons:9.4 (2 constraints: 94171c72)
+org.ow2.asm:asm-tree:9.4 (2 constraints: 11129514)
 org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530)
 org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
 org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
@@ -330,7 +331,7 @@ software.amazon.awssdk:third-party-jackson-core:2.17.63 (2 constraints: 931b14a8
 software.amazon.awssdk:utils:2.17.63 (17 constraints: 0bffaaab)
 software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b)
 ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e)
-xerces:xercesImpl:2.12.2 (1 constraints: 8e0c7d0e)
+xerces:xercesImpl:2.12.2 (2 constraints: ba1cc124)
 
 [Test dependencies]
 com.adobe.testing:s3mock:2.1.34 (1 constraints: b012831d)
@@ -389,9 +390,9 @@ org.glassfish.jersey.test-framework:jersey-test-framework-core:2.35 (2 constrain
 org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.35 (1 constraints: de04fe30)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
 org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
-org.jetbrains.kotlin:kotlin-reflect:1.6.10 (2 constraints: 6224e0e2)
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0 (1 constraints: ae1013c2)
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 (2 constraints: 5e203d24)
+org.jetbrains.kotlin:kotlin-reflect:1.7.21 (3 constraints: 61328ffd)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21 (2 constraints: e11ec2c7)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21 (3 constraints: 5d2e399a)
 org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
 org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)
 org.objenesis:objenesis:3.1 (1 constraints: b00a12bd)
@@ -413,6 +414,6 @@ org.springframework.boot:spring-boot-starter-jetty:2.5.14 (1 constraints: 1d0d31
 org.springframework.boot:spring-boot-starter-json:2.5.14 (1 constraints: d814609e)
 org.springframework.boot:spring-boot-starter-logging:2.5.14 (1 constraints: 6d138546)
 org.springframework.boot:spring-boot-starter-web:2.5.14 (1 constraints: 1d0d3137)
-org.yaml:snakeyaml:1.28 (1 constraints: 0e13df1f)
+org.yaml:snakeyaml:1.33 (2 constraints: dc224ce5)
 software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7)
 software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831)
diff --git a/versions.props b/versions.props
@@ -5,7 +5,7 @@ com.carrotsearch:hppc=0.9.1
 com.cybozu.labs:langdetect=1.1-20120112
 com.fasterxml.jackson:jackson-bom=2.14.1
 com.fasterxml.woodstox:woodstox-core=6.4.0
-com.github.ben-manes.caffeine:caffeine=3.1.1
+com.github.ben-manes.caffeine:caffeine=3.1.2
 com.github.spotbugs:*=4.7.2
 com.google.cloud:google-cloud-bom=0.178.0
 com.google.errorprone:*=2.16