From 2d9228dfa874cd94760eb19f47aab9058b9652a0 Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Wed, 19 Mar 2014 00:34:34 +0000
Subject: [PATCH] SOLR-5763: Upgrade to Tika 1.5

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579100 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/ivy-versions.properties                      | 8 ++++----
 solr/contrib/extraction/ivy.xml                     | 3 ---
 solr/licenses/fontbox-1.8.1.jar.sha1                | 1 -
 solr/licenses/fontbox-1.8.4.jar.sha1                | 1 +
 solr/licenses/jempbox-1.8.1.jar.sha1                | 1 -
 solr/licenses/jempbox-1.8.4.jar.sha1                | 1 +
 solr/licenses/pdfbox-1.8.1.jar.sha1                 | 1 -
 solr/licenses/pdfbox-1.8.4.jar.sha1                 | 1 +
 solr/licenses/poi-3.10-beta2.jar.sha1               | 1 +
 solr/licenses/poi-3.9.jar.sha1                      | 1 -
 solr/licenses/poi-ooxml-3.10-beta2.jar.sha1         | 1 +
 solr/licenses/poi-ooxml-3.9.jar.sha1                | 1 -
 solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1 | 1 +
 solr/licenses/poi-ooxml-schemas-3.9.jar.sha1        | 1 -
 solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1    | 1 +
 solr/licenses/poi-scratchpad-3.9.jar.sha1           | 1 -
 solr/licenses/tika-core-1.4.jar.sha1                | 1 -
 solr/licenses/tika-core-1.5.jar.sha1                | 1 +
 solr/licenses/tika-parsers-1.4.jar.sha1             | 1 -
 solr/licenses/tika-parsers-1.5.jar.sha1             | 1 +
 solr/licenses/tika-xmp-1.4.jar.sha1                 | 1 -
 solr/licenses/tika-xmp-1.5.jar.sha1                 | 1 +
 solr/licenses/xz-1.0.jar.sha1                       | 1 -
 solr/licenses/xz-1.2.jar.sha1                       | 1 +
 24 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 solr/licenses/fontbox-1.8.1.jar.sha1
 create mode 100644 solr/licenses/fontbox-1.8.4.jar.sha1
 delete mode 100644 solr/licenses/jempbox-1.8.1.jar.sha1
 create mode 100644 solr/licenses/jempbox-1.8.4.jar.sha1
 delete mode 100644 solr/licenses/pdfbox-1.8.1.jar.sha1
 create mode 100644 solr/licenses/pdfbox-1.8.4.jar.sha1
 create mode 100644 solr/licenses/poi-3.10-beta2.jar.sha1
 delete mode 100644 solr/licenses/poi-3.9.jar.sha1
 create mode 100644 solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
 delete mode 100644 solr/licenses/poi-ooxml-3.9.jar.sha1
 create mode 100644 solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
 delete mode 100644 solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
 create mode 100644 solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
 delete mode 100644 solr/licenses/poi-scratchpad-3.9.jar.sha1
 delete mode 100644 solr/licenses/tika-core-1.4.jar.sha1
 create mode 100644 solr/licenses/tika-core-1.5.jar.sha1
 delete mode 100644 solr/licenses/tika-parsers-1.4.jar.sha1
 create mode 100644 solr/licenses/tika-parsers-1.5.jar.sha1
 delete mode 100644 solr/licenses/tika-xmp-1.4.jar.sha1
 create mode 100644 solr/licenses/tika-xmp-1.5.jar.sha1
 delete mode 100644 solr/licenses/xz-1.0.jar.sha1
 create mode 100644 solr/licenses/xz-1.2.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index f2730afb2dd..19aa56f51ce 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -121,18 +121,18 @@ org.apache.james.apache.mime4j.version = 0.7.2
 /org.apache.mahout/mahout-math = 0.6
 /org.apache.mrunit/mrunit = 1.0.0
 
-org.apache.pdfbox.version = 1.8.1
+org.apache.pdfbox.version = 1.8.4
 /org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
 /org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
 /org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
 
-org.apache.poi.version = 3.9
+org.apache.poi.version = 3.10-beta2
 /org.apache.poi/poi = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
 /org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
 
-org.apache.tika.version = 1.4
+org.apache.tika.version = 1.5
 /org.apache.tika/tika-core = ${org.apache.tika.version}
 /org.apache.tika/tika-parsers = ${org.apache.tika.version}
 /org.apache.tika/tika-xmp = ${org.apache.tika.version}
@@ -226,7 +226,7 @@ org.slf4j.version = 1.7.6
 /org.slf4j/slf4j-api = ${org.slf4j.version}
 /org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
 
-/org.tukaani/xz = 1.0
+/org.tukaani/xz = 1.2
 /org.xerial.snappy/snappy-java = 1.0.4.1
 /rome/rome = 0.9
 /xerces/xercesImpl = 2.9.1
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index 263c48832c9..30af1fedc7b 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -53,10 +53,7 @@
       <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
       <dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" transitive="false"/>
       <dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" transitive="false"/>
-      <dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" transitive="false"/>
-      <dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" transitive="false"/>
       <dependency org="asm" name="asm" rev="${/asm/asm}" transitive="false"/>
-      <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
 
       <!-- Other ExtracingRequestHandler dependencies -->
       <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
diff --git a/solr/licenses/fontbox-1.8.1.jar.sha1 b/solr/licenses/fontbox-1.8.1.jar.sha1
deleted file mode 100644
index 7f6a9c099d4..00000000000
--- a/solr/licenses/fontbox-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-32879bb6bb87b15c6d53bc358e83ede40fc729ae
diff --git a/solr/licenses/fontbox-1.8.4.jar.sha1 b/solr/licenses/fontbox-1.8.4.jar.sha1
new file mode 100644
index 00000000000..a59fbcb0ce9
--- /dev/null
+++ b/solr/licenses/fontbox-1.8.4.jar.sha1
@@ -0,0 +1 @@
+309d407439e059e1df94397968b63018164fe060
diff --git a/solr/licenses/jempbox-1.8.1.jar.sha1 b/solr/licenses/jempbox-1.8.1.jar.sha1
deleted file mode 100644
index 34ebdae04ea..00000000000
--- a/solr/licenses/jempbox-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a34de98c20293b07474aa17cb05dad66070b9c8
diff --git a/solr/licenses/jempbox-1.8.4.jar.sha1 b/solr/licenses/jempbox-1.8.4.jar.sha1
new file mode 100644
index 00000000000..8b1450c4851
--- /dev/null
+++ b/solr/licenses/jempbox-1.8.4.jar.sha1
@@ -0,0 +1 @@
+dff1caf2a145958188aebfc111cbcbee5f8b4909
diff --git a/solr/licenses/pdfbox-1.8.1.jar.sha1 b/solr/licenses/pdfbox-1.8.1.jar.sha1
deleted file mode 100644
index ea2e68625bf..00000000000
--- a/solr/licenses/pdfbox-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2127ceef9eceffe4fefe445fa8eae4609c51e145
diff --git a/solr/licenses/pdfbox-1.8.4.jar.sha1 b/solr/licenses/pdfbox-1.8.4.jar.sha1
new file mode 100644
index 00000000000..4738a3e538c
--- /dev/null
+++ b/solr/licenses/pdfbox-1.8.4.jar.sha1
@@ -0,0 +1 @@
+4a329a6d27166a1905a5ec84e32b43d87aced874
diff --git a/solr/licenses/poi-3.10-beta2.jar.sha1 b/solr/licenses/poi-3.10-beta2.jar.sha1
new file mode 100644
index 00000000000..892de8b798f
--- /dev/null
+++ b/solr/licenses/poi-3.10-beta2.jar.sha1
@@ -0,0 +1 @@
+b5c83b368a241c57c60425da22e596f4ca53d998
diff --git a/solr/licenses/poi-3.9.jar.sha1 b/solr/licenses/poi-3.9.jar.sha1
deleted file mode 100644
index 8dc4c71566d..00000000000
--- a/solr/licenses/poi-3.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d5e41354e88322e4bc590b31f3d2d1d52b3e6ac
diff --git a/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1 b/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
new file mode 100644
index 00000000000..95efeb6ee13
--- /dev/null
+++ b/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
@@ -0,0 +1 @@
+d3add814d320629789bd83f359cae1c8b0fa997d
diff --git a/solr/licenses/poi-ooxml-3.9.jar.sha1 b/solr/licenses/poi-ooxml-3.9.jar.sha1
deleted file mode 100644
index 3425b0e0c66..00000000000
--- a/solr/licenses/poi-ooxml-3.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbe83c739d22eecfacd06d7e0b99ba13277040ed
diff --git a/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
new file mode 100644
index 00000000000..42457bf65c3
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
@@ -0,0 +1 @@
+5e102576d1784b37bc5e4fd8389bb112abe3900d
diff --git a/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
deleted file mode 100644
index 94341cee9e6..00000000000
--- a/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c514498f0e82cccfdd3208b9caff2f45158db4a
diff --git a/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1 b/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
new file mode 100644
index 00000000000..5b1b59fac05
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
@@ -0,0 +1 @@
+7e0bd38486054edd0de4a673505c4523aca261d7
diff --git a/solr/licenses/poi-scratchpad-3.9.jar.sha1 b/solr/licenses/poi-scratchpad-3.9.jar.sha1
deleted file mode 100644
index ee48b1f34a3..00000000000
--- a/solr/licenses/poi-scratchpad-3.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f07d54f88a9f6c743d133be8d4446879a1e6729
diff --git a/solr/licenses/tika-core-1.4.jar.sha1 b/solr/licenses/tika-core-1.4.jar.sha1
deleted file mode 100644
index b22276e0dd1..00000000000
--- a/solr/licenses/tika-core-1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30fd5d2c4c21ed908d4b74064ac7f4f4fdbe9ae7
diff --git a/solr/licenses/tika-core-1.5.jar.sha1 b/solr/licenses/tika-core-1.5.jar.sha1
new file mode 100644
index 00000000000..3632fa73f1e
--- /dev/null
+++ b/solr/licenses/tika-core-1.5.jar.sha1
@@ -0,0 +1 @@
+194ca0fb3d73b07737524806fbc3bec89063c03a
diff --git a/solr/licenses/tika-parsers-1.4.jar.sha1 b/solr/licenses/tika-parsers-1.4.jar.sha1
deleted file mode 100644
index 7179010353a..00000000000
--- a/solr/licenses/tika-parsers-1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58aba11789dc508f004e3352948394c9e395fb50
diff --git a/solr/licenses/tika-parsers-1.5.jar.sha1 b/solr/licenses/tika-parsers-1.5.jar.sha1
new file mode 100644
index 00000000000..0025b7aba64
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.5.jar.sha1
@@ -0,0 +1 @@
+9b895231b7a0dae7349dfb42cb1b926c345b5281
diff --git a/solr/licenses/tika-xmp-1.4.jar.sha1 b/solr/licenses/tika-xmp-1.4.jar.sha1
deleted file mode 100644
index e0d756cdb09..00000000000
--- a/solr/licenses/tika-xmp-1.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-412c97017eb6318e30c47e9a69e51879b20b4dde
diff --git a/solr/licenses/tika-xmp-1.5.jar.sha1 b/solr/licenses/tika-xmp-1.5.jar.sha1
new file mode 100644
index 00000000000..9d8a9cab04f
--- /dev/null
+++ b/solr/licenses/tika-xmp-1.5.jar.sha1
@@ -0,0 +1 @@
+68a5c5b06e79e691ebaf91ea96042c55a1e12e24
diff --git a/solr/licenses/xz-1.0.jar.sha1 b/solr/licenses/xz-1.0.jar.sha1
deleted file mode 100644
index 9e449a135b4..00000000000
--- a/solr/licenses/xz-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecff5cb8b1189514c9d1d8d68eb77ac372e000c9
diff --git a/solr/licenses/xz-1.2.jar.sha1 b/solr/licenses/xz-1.2.jar.sha1
new file mode 100644
index 00000000000..e29628e114c
--- /dev/null
+++ b/solr/licenses/xz-1.2.jar.sha1
@@ -0,0 +1 @@
+bfc66dda280a18ab341b5023248925265c00394c