Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15632 Upgrade to CaffeineCache 3.0.5 (#295)

Mike Drob819d63c09b35
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8111e3241b8..030baeff36e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -522,6 +522,8 @@ and each individual module's jar will be included in its directory's lib/ folder
* SOLR-15917: "Contrib Modules" have been renamed to "Modules" and have been moved from "contrib/" to "modules/". (Houston Putman)
+* SOLR-15632: Upgrade to Caffeine Cache 3.0.5 (Mike Drob)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of 4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git a/solr/licenses/caffeine-2.9.2.jar.sha1 b/solr/licenses/caffeine-2.9.2.jar.sha1
deleted file mode 100644
index 032dd105965..00000000000
--- a/solr/licenses/caffeine-2.9.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a17ed335e0ce2d337750772c0709b79af35a842
diff --git a/solr/licenses/caffeine-3.0.5.jar.sha1 b/solr/licenses/caffeine-3.0.5.jar.sha1
new file mode 100644
index 00000000000..3a1291e1337
--- /dev/null
+++ b/solr/licenses/caffeine-3.0.5.jar.sha1
@@ -0,0 +1 @@
+3de85488bf535299d5f36d98626605331a10de87
diff --git a/versions.lock b/versions.lock
index 62980d77567..66028799107 100644
--- a/versions.lock
+++ b/versions.lock
@@ -12,7 +12,7 @@ com.fasterxml.jackson.core:jackson-core:2.12.3 (13 constraints: e304bc9b)
com.fasterxml.jackson.core:jackson-databind:2.12.3 (17 constraints: 5e455fcf)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: f1137d82)
com.fasterxml.woodstox:woodstox-core:6.2.4 (2 constraints: 4d1cac9f)
-com.github.ben-manes.caffeine:caffeine:2.9.2 (1 constraints: 0f051236)
+com.github.ben-manes.caffeine:caffeine:3.0.5 (1 constraints: 0a05ff35)
com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530)
com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636)
com.google.api:api-common:1.10.1 (4 constraints: 822c34f6)
diff --git a/versions.props b/versions.props
index b6f117eab96..b9409cfecda 100644
--- a/versions.props
+++ b/versions.props
@@ -8,7 +8,7 @@ com.epam:parso=2.0.11
com.esri.geometry:esri-geometry-api=2.2.0
com.fasterxml.jackson*:*=2.12.3
com.fasterxml.woodstox:woodstox-core=6.2.4
-com.github.ben-manes.caffeine:caffeine=2.9.2
+com.github.ben-manes.caffeine:caffeine=3.0.5
com.github.virtuald:curvesapi=1.06
com.github.zafarkhaja:java-semver=0.9.0
com.google.api-client:google-api-client=1.32.1