From 07e4d86207b789ccc3cee15e9c10ed57c48a3e54 Mon Sep 17 00:00:00 2001 From: ngomx Date: Fri, 4 Oct 2019 15:04:26 -0400 Subject: [PATCH] SOLR-13818: Upgrade jackson to 2.10.0 Signed-off-by: Kevin Risden --- lucene/ivy-versions.properties | 4 ++-- solr/CHANGES.txt | 2 ++ solr/licenses/jackson-annotations-2.10.0.jar.sha1 | 1 + solr/licenses/jackson-annotations-2.9.9.jar.sha1 | 1 - solr/licenses/jackson-core-2.10.0.jar.sha1 | 1 + solr/licenses/jackson-core-2.9.9.jar.sha1 | 1 - solr/licenses/jackson-databind-2.10.0.jar.sha1 | 1 + solr/licenses/jackson-databind-2.9.9.3.jar.sha1 | 1 - solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 | 1 + solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 | 1 - 10 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 solr/licenses/jackson-annotations-2.10.0.jar.sha1 delete mode 100644 solr/licenses/jackson-annotations-2.9.9.jar.sha1 create mode 100644 solr/licenses/jackson-core-2.10.0.jar.sha1 delete mode 100644 solr/licenses/jackson-core-2.9.9.jar.sha1 create mode 100644 solr/licenses/jackson-databind-2.10.0.jar.sha1 delete mode 100644 solr/licenses/jackson-databind-2.9.9.3.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 delete 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 a1f6db3689d..160a4cd71dd 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -17,10 +17,10 @@ com.carrotsearch.randomizedtesting.version = 2.7.2 /com.epam/parso = 2.0.9 -com.fasterxml.jackson.core.version = 2.9.9 +com.fasterxml.jackson.core.version = 2.10.0 /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 = 2.9.9.3 +/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 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index a87f04798e9..2ea8e3adbf9 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -236,6 +236,8 @@ Other Changes * SOLR-13998: Add thread safety annotations to Solr. This only introduces the annotations and doesn't add these to existing classes. (Anshum Gupta, Mark Miller) +* SOLR-13818: Upgrade jackson to 2.10.0 (marungo, Andras Salamon via Kevin Risden) + ================== 8.3.1 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/licenses/jackson-annotations-2.10.0.jar.sha1 b/solr/licenses/jackson-annotations-2.10.0.jar.sha1 new file mode 100644 index 00000000000..bbfd7ceadf0 --- /dev/null +++ b/solr/licenses/jackson-annotations-2.10.0.jar.sha1 @@ -0,0 +1 @@ +e01cfd93b80d6773b3f757c78e756c9755b47b81 diff --git a/solr/licenses/jackson-annotations-2.9.9.jar.sha1 b/solr/licenses/jackson-annotations-2.9.9.jar.sha1 deleted file mode 100644 index 7cf1b18f110..00000000000 --- a/solr/licenses/jackson-annotations-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ea299c145207161c212e28abbc8f513fa245940 diff --git a/solr/licenses/jackson-core-2.10.0.jar.sha1 b/solr/licenses/jackson-core-2.10.0.jar.sha1 new file mode 100644 index 00000000000..6511c3aa3d7 --- /dev/null +++ b/solr/licenses/jackson-core-2.10.0.jar.sha1 @@ -0,0 +1 @@ +4e2c5fa04648ec9772c63e2101c53af6504e624e diff --git a/solr/licenses/jackson-core-2.9.9.jar.sha1 b/solr/licenses/jackson-core-2.9.9.jar.sha1 deleted file mode 100644 index d81f13017a5..00000000000 --- a/solr/licenses/jackson-core-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfff5af9fb8347d26bbb7959cb9b4fe9a2b0ca5e diff --git a/solr/licenses/jackson-databind-2.10.0.jar.sha1 b/solr/licenses/jackson-databind-2.10.0.jar.sha1 new file mode 100644 index 00000000000..e7b7c74873f --- /dev/null +++ b/solr/licenses/jackson-databind-2.10.0.jar.sha1 @@ -0,0 +1 @@ +1127c9cf62f2bb3121a3a2a0a1351d251a602117 diff --git a/solr/licenses/jackson-databind-2.9.9.3.jar.sha1 b/solr/licenses/jackson-databind-2.9.9.3.jar.sha1 deleted file mode 100644 index 6b26e158ca0..00000000000 --- a/solr/licenses/jackson-databind-2.9.9.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -68ddd453458765757fd3ffca9437f9a42d91003e diff --git a/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 new file mode 100644 index 00000000000..342621d7216 --- /dev/null +++ b/solr/licenses/jackson-dataformat-smile-2.10.0.jar.sha1 @@ -0,0 +1 @@ +e761e9b93d2da05e5ea1bc4deff1d75cb13b106b diff --git a/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 deleted file mode 100644 index 7d77811c001..00000000000 --- a/solr/licenses/jackson-dataformat-smile-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85749406c69b08945d6059db679cc66990340ebc