From fce0a5d45b16cba8e758cda534bae0a1d89d8ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@apache.org>
Date: Tue, 17 Sep 2019 01:13:23 +0200
Subject: [PATCH] SOLR-13767: Upgrade jackson to 2.9.9 (#886)

(cherry picked from commit b617769614a5dedf2bcbb317fcddc73711ac407f)
---
 lucene/ivy-versions.properties                        | 4 ++--
 solr/CHANGES.txt                                      | 2 ++
 solr/licenses/jackson-annotations-2.9.8.jar.sha1      | 1 -
 solr/licenses/jackson-annotations-2.9.9.jar.sha1      | 1 +
 solr/licenses/jackson-core-2.9.8.jar.sha1             | 1 -
 solr/licenses/jackson-core-2.9.9.jar.sha1             | 1 +
 solr/licenses/jackson-databind-2.9.8.jar.sha1         | 1 -
 solr/licenses/jackson-databind-2.9.9.3.jar.sha1       | 1 +
 solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1 | 1 -
 solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 | 1 +
 10 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 solr/licenses/jackson-annotations-2.9.8.jar.sha1
 create mode 100644 solr/licenses/jackson-annotations-2.9.9.jar.sha1
 delete mode 100644 solr/licenses/jackson-core-2.9.8.jar.sha1
 create mode 100644 solr/licenses/jackson-core-2.9.9.jar.sha1
 delete mode 100644 solr/licenses/jackson-databind-2.9.8.jar.sha1
 create mode 100644 solr/licenses/jackson-databind-2.9.9.3.jar.sha1
 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
 create mode 100644 solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 128588501c0..1fe450b83ec 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -15,10 +15,10 @@ com.carrotsearch.randomizedtesting.version = 2.7.2
 
 /com.epam/parso = 2.0.9
 
-com.fasterxml.jackson.core.version = 2.9.8
+com.fasterxml.jackson.core.version = 2.9.9
 /com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
 /com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
-/com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
+/com.fasterxml.jackson.core/jackson-databind = 2.9.9.3
 /com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}
 
 /com.github.ben-manes.caffeine/caffeine = 2.4.0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 46794cd3e03..e0113785b74 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -174,6 +174,8 @@ Other Changes
 
 * SOLR-13658: Precommit fail Java "var" until 9x. Fail "var...<>" constructs entirely (Erick Erickson)
 
+* SOLR-13767: Upgrade jackson to 2.9.9 (janhoy)
+
 ==================  8.2.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/licenses/jackson-annotations-2.9.8.jar.sha1 b/solr/licenses/jackson-annotations-2.9.8.jar.sha1
deleted file mode 100644
index 64b57a832ff..00000000000
--- a/solr/licenses/jackson-annotations-2.9.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba7f0e6f8f1b28d251eeff2a5604bed34c53ff35
diff --git a/solr/licenses/jackson-annotations-2.9.9.jar.sha1 b/solr/licenses/jackson-annotations-2.9.9.jar.sha1
new file mode 100644
index 00000000000..7cf1b18f110
--- /dev/null
+++ b/solr/licenses/jackson-annotations-2.9.9.jar.sha1
@@ -0,0 +1 @@
+2ea299c145207161c212e28abbc8f513fa245940
diff --git a/solr/licenses/jackson-core-2.9.8.jar.sha1 b/solr/licenses/jackson-core-2.9.8.jar.sha1
deleted file mode 100644
index 7634344bc1a..00000000000
--- a/solr/licenses/jackson-core-2.9.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f5a654e4675769c716e5b387830d19b501ca191
diff --git a/solr/licenses/jackson-core-2.9.9.jar.sha1 b/solr/licenses/jackson-core-2.9.9.jar.sha1
new file mode 100644
index 00000000000..d81f13017a5
--- /dev/null
+++ b/solr/licenses/jackson-core-2.9.9.jar.sha1
@@ -0,0 +1 @@
+bfff5af9fb8347d26bbb7959cb9b4fe9a2b0ca5e
diff --git a/solr/licenses/jackson-databind-2.9.8.jar.sha1 b/solr/licenses/jackson-databind-2.9.8.jar.sha1
deleted file mode 100644
index 3319cf30280..00000000000
--- a/solr/licenses/jackson-databind-2.9.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-11283f21cc480aa86c4df7a0a3243ec508372ed2
diff --git a/solr/licenses/jackson-databind-2.9.9.3.jar.sha1 b/solr/licenses/jackson-databind-2.9.9.3.jar.sha1
new file mode 100644
index 00000000000..6b26e158ca0
--- /dev/null
+++ b/solr/licenses/jackson-databind-2.9.9.3.jar.sha1
@@ -0,0 +1 @@
+68ddd453458765757fd3ffca9437f9a42d91003e
diff --git a/solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
deleted file mode 100644
index a4787c06b70..00000000000
--- a/solr/licenses/jackson-dataformat-smile-2.9.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbb47a052ac2b249ae004ce32e1e0c8bd8ee526c
diff --git a/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1
new file mode 100644
index 00000000000..7d77811c001
--- /dev/null
+++ b/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1
@@ -0,0 +1 @@
+85749406c69b08945d6059db679cc66990340ebc