From 22044fcabb84b17909a90abe9b411ab838f01d26 Mon Sep 17 00:00:00 2001
From: Andrzej Bialecki <ab@apache.org>
Date: Tue, 26 May 2020 12:56:08 +0200
Subject: [PATCH] SOLR-14498: Upgrade to Caffeine 2.8.4, which fixes the cache
 poisoning issue.

---
 lucene/ivy-versions.properties        | 2 +-
 solr/CHANGES.txt                      | 2 ++
 solr/licenses/caffeine-2.8.0.jar.sha1 | 1 -
 solr/licenses/caffeine-2.8.4.jar.sha1 | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 solr/licenses/caffeine-2.8.0.jar.sha1
 create mode 100644 solr/licenses/caffeine-2.8.4.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 3fccbfb05a3..ed4f53a4072 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -23,7 +23,7 @@ com.fasterxml.jackson.core.version = 2.10.1
 /com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
 /com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}
 
-/com.github.ben-manes.caffeine/caffeine = 2.8.0
+/com.github.ben-manes.caffeine/caffeine = 2.8.4
 /com.github.virtuald/curvesapi = 1.06
 
 /com.github.zafarkhaja/java-semver = 0.9.0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 62f3a9c8bed..a5cf874dd56 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -201,6 +201,8 @@ Bug Fixes
 * SOLR-14504: ZkController LiveNodesListener has NullPointerException in startup race.
   (Colvin Cowie via ab)
 
+* SOLR-14498: Upgrade to Caffeine 2.8.4, which fixes the cache poisoning issue. (Jakub Zytka, ab)
+
 Other Changes
 ---------------------
 * SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid
diff --git a/solr/licenses/caffeine-2.8.0.jar.sha1 b/solr/licenses/caffeine-2.8.0.jar.sha1
deleted file mode 100644
index ce291c47425..00000000000
--- a/solr/licenses/caffeine-2.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6000774d7f8412ced005a704188ced78beeed2bb
diff --git a/solr/licenses/caffeine-2.8.4.jar.sha1 b/solr/licenses/caffeine-2.8.4.jar.sha1
new file mode 100644
index 00000000000..813e00d57d0
--- /dev/null
+++ b/solr/licenses/caffeine-2.8.4.jar.sha1
@@ -0,0 +1 @@
+e5730b11981406faa28e0912405a0ce7c2d0f377