SOLR-14367: Upgrade Tika to 1.24

yiluncui · Mar 29, 2020 · 5c2011a · 5c2011a
1 parent 782ded2
commit 5c2011a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
diff --git a/solr/licenses/tika-core-1.24.jar.sha1 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
diff --git a/solr/licenses/tika-java7-1.24.jar.sha1 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
diff --git a/solr/licenses/tika-parsers-1.24.jar.sha1 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
diff --git a/solr/licenses/tika-xmp-1.24.jar.sha1 b/solr/licenses/tika-xmp-1.24.jar.sha1
@@ -0,0 +1 @@
+f701304969357cb6244da4a1aca22479f08e47bd
diff --git 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
@@ -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