From 5c2011a6fb7d3c8331dc261e505f058ed64016bc Mon Sep 17 00:00:00 2001
From: Erick Erickson <Erick.Erickson@gmail.com>
Date: Sun, 29 Mar 2020 08:48:00 -0400
Subject: [PATCH] SOLR-14367: Upgrade Tika to 1.24

---
 lucene/ivy-versions.properties           | 2 +-
 solr/CHANGES.txt                         | 2 ++
 solr/licenses/tika-core-1.23.jar.sha1    | 1 -
 solr/licenses/tika-core-1.24.jar.sha1    | 1 +
 solr/licenses/tika-java7-1.23.jar.sha1   | 1 -
 solr/licenses/tika-java7-1.24.jar.sha1   | 1 +
 solr/licenses/tika-parsers-1.23.jar.sha1 | 1 -
 solr/licenses/tika-parsers-1.24.jar.sha1 | 1 +
 solr/licenses/tika-xmp-1.23.jar.sha1     | 1 -
 solr/licenses/tika-xmp-1.24.jar.sha1     | 1 +
 versions.lock                            | 8 ++++----
 versions.props                           | 2 +-
 12 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 solr/licenses/tika-core-1.23.jar.sha1
 create mode 100644 solr/licenses/tika-core-1.24.jar.sha1
 delete mode 100644 solr/licenses/tika-java7-1.23.jar.sha1
 create mode 100644 solr/licenses/tika-java7-1.24.jar.sha1
 delete mode 100644 solr/licenses/tika-parsers-1.23.jar.sha1
 create mode 100644 solr/licenses/tika-parsers-1.24.jar.sha1
 delete mode 100644 solr/licenses/tika-xmp-1.23.jar.sha1
 create mode 100644 solr/licenses/tika-xmp-1.24.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 0cfd5f524b6..93a2cae24b3 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -203,7 +203,7 @@ org.apache.poi.version = 4.1.1
 org.apache.thrift.version = 0.13.0
 /org.apache.thrift/libthrift = ${org.apache.thrift.version}
 
-org.apache.tika.version = 1.23
+org.apache.tika.version = 1.24
 /org.apache.tika/tika-core = ${org.apache.tika.version}
 /org.apache.tika/tika-java7 = ${org.apache.tika.version}
 /org.apache.tika/tika-parsers = ${org.apache.tika.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b0fddbcab5c..b345e76599c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -119,6 +119,8 @@ Other Changes
 * SOLR-13893: BlobRepository reads max jar size from `runtime.lib.size` system property. Old `runtme.lib.size` is Deprecated
   (Erick Erickson, Kesharee Nandan Vishwakarma, Munendra S N)
 
+* SOLR-14367: Upgrade Tika to 1.24 (Mibo via Erick Erickson)
+
 ==================  8.5.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/licenses/tika-core-1.23.jar.sha1 b/solr/licenses/tika-core-1.23.jar.sha1
deleted file mode 100644
index 636d764ed55..00000000000
--- a/solr/licenses/tika-core-1.23.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ae162fa4758b8f3da5d0651c000c5e5f9efca04
diff --git a/solr/licenses/tika-core-1.24.jar.sha1 b/solr/licenses/tika-core-1.24.jar.sha1
new file mode 100644
index 00000000000..857181d2067
--- /dev/null
+++ b/solr/licenses/tika-core-1.24.jar.sha1
@@ -0,0 +1 @@
+ed2e85f034743ea8e7ff25ab594caf361c408a44
diff --git a/solr/licenses/tika-java7-1.23.jar.sha1 b/solr/licenses/tika-java7-1.23.jar.sha1
deleted file mode 100644
index e250582114f..00000000000
--- a/solr/licenses/tika-java7-1.23.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a9fad98d86348c028cc6287b4f47aba5ff070ca3
diff --git a/solr/licenses/tika-java7-1.24.jar.sha1 b/solr/licenses/tika-java7-1.24.jar.sha1
new file mode 100644
index 00000000000..4527f3264ff
--- /dev/null
+++ b/solr/licenses/tika-java7-1.24.jar.sha1
@@ -0,0 +1 @@
+1419be531280da55679c3f4ae7f6e8506a80c150
diff --git a/solr/licenses/tika-parsers-1.23.jar.sha1 b/solr/licenses/tika-parsers-1.23.jar.sha1
deleted file mode 100644
index d7b00dbab6f..00000000000
--- a/solr/licenses/tika-parsers-1.23.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9507a1123b6fbb3de7c99368589fac4184cbcfaa
diff --git a/solr/licenses/tika-parsers-1.24.jar.sha1 b/solr/licenses/tika-parsers-1.24.jar.sha1
new file mode 100644
index 00000000000..d595bc9ef5a
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.24.jar.sha1
@@ -0,0 +1 @@
+282c0ecd31cb235f7d96bef18b8cdcb56573a195
diff --git a/solr/licenses/tika-xmp-1.23.jar.sha1 b/solr/licenses/tika-xmp-1.23.jar.sha1
deleted file mode 100644
index 0eac3233c09..00000000000
--- a/solr/licenses/tika-xmp-1.23.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8f9b23cbfee3f3025cc7bf623c85ba8356937f50
diff --git a/solr/licenses/tika-xmp-1.24.jar.sha1 b/solr/licenses/tika-xmp-1.24.jar.sha1
new file mode 100644
index 00000000000..965a42a4236
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.24.jar.sha1
@@ -0,0 +1 @@
+f701304969357cb6244da4a1aca22479f08e47bd
diff --git a/versions.lock b/versions.lock
index 4373150c48e..77075c8edae 100644
--- a/versions.lock
+++ b/versions.lock
@@ -130,10 +130,10 @@ org.apache.poi:poi-ooxml:4.1.1 (1 constraints: 08050336)
 org.apache.poi:poi-ooxml-schemas:4.1.1 (1 constraints: 08050336)
 org.apache.poi:poi-scratchpad:4.1.1 (1 constraints: 08050336)
 org.apache.thrift:libthrift:0.13.0 (1 constraints: 8e0dfd33)
-org.apache.tika:tika-core:1.23 (1 constraints: da04f630)
-org.apache.tika:tika-java7:1.23 (1 constraints: da04f630)
-org.apache.tika:tika-parsers:1.23 (1 constraints: da04f630)
-org.apache.tika:tika-xmp:1.23 (1 constraints: da04f630)
+org.apache.tika:tika-core:1.24 (1 constraints: db04f730)
+org.apache.tika:tika-java7:1.24 (1 constraints: db04f730)
+org.apache.tika:tika-parsers:1.24 (1 constraints: db04f730)
+org.apache.tika:tika-xmp:1.24 (1 constraints: db04f730)
 org.apache.velocity:velocity-engine-core:2.0 (3 constraints: 973bcd79)
 org.apache.velocity.tools:velocity-tools-generic:3.0 (1 constraints: 00136415)
 org.apache.velocity.tools:velocity-tools-view:3.0 (1 constraints: 7a14126a)
diff --git a/versions.props b/versions.props
index 1ea12e5e279..92a23412764 100644
--- a/versions.props
+++ b/versions.props
@@ -72,7 +72,7 @@ org.apache.opennlp:opennlp-tools=1.9.1
 org.apache.pdfbox:*=2.0.17
 org.apache.pdfbox:jempbox=1.8.16
 org.apache.poi:*=4.1.1
-org.apache.tika:*=1.23
+org.apache.tika:*=1.24
 org.apache.velocity.tools:*=3.0
 org.apache.xmlbeans:xmlbeans=3.1.0
 org.apache.zookeeper:*=3.5.7