diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index dd6fd8cbacb..dc864d11fbc 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -47,7 +47,7 @@
8.1.10.v20130312
1.6.6
1.2.16
- 1.3
+ 1.4
4.2.3
2.1
2.1.1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3135a100cd1..fa16ed32302 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -24,7 +24,7 @@ $Id$
Versions of Major Components
---------------------
-Apache Tika 1.3
+Apache Tika 1.4
Carrot2 3.6.2
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -53,7 +53,7 @@ Other Changes
Versions of Major Components
---------------------
-Apache Tika 1.3
+Apache Tika 1.4
Carrot2 3.6.2
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -302,6 +302,8 @@ Other Changes
* SOLR-4966: CSS, JS and other files in webapp without license (uschindler,
steffkes)
+* SOLR-4986: Upgrade to Tika 1.4 (Markus Jelsma via janhoy)
+
================== 4.3.1 ==================
Versions of Major Components
diff --git a/solr/contrib/extraction/ivy.xml b/solr/contrib/extraction/ivy.xml
index fab64925e16..16dfb3c19ce 100644
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@ -20,8 +20,8 @@
-
-
+
+
@@ -31,15 +31,15 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/solr/licenses/fontbox-1.7.1.jar.sha1 b/solr/licenses/fontbox-1.7.1.jar.sha1
deleted file mode 100644
index 9fab3a664c2..00000000000
--- a/solr/licenses/fontbox-1.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6a6b6598d0e263c751fccff26ef4fdf8543888e7
diff --git a/solr/licenses/fontbox-1.8.1.jar.sha1 b/solr/licenses/fontbox-1.8.1.jar.sha1
new file mode 100644
index 00000000000..7f6a9c099d4
--- /dev/null
+++ b/solr/licenses/fontbox-1.8.1.jar.sha1
@@ -0,0 +1 @@
+32879bb6bb87b15c6d53bc358e83ede40fc729ae
diff --git a/solr/licenses/jempbox-1.7.1.jar.sha1 b/solr/licenses/jempbox-1.7.1.jar.sha1
deleted file mode 100644
index c2e17d945b1..00000000000
--- a/solr/licenses/jempbox-1.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a94e7b5289f58486390619e87a50a3bb1d9750c3
diff --git a/solr/licenses/jempbox-1.8.1.jar.sha1 b/solr/licenses/jempbox-1.8.1.jar.sha1
new file mode 100644
index 00000000000..34ebdae04ea
--- /dev/null
+++ b/solr/licenses/jempbox-1.8.1.jar.sha1
@@ -0,0 +1 @@
+1a34de98c20293b07474aa17cb05dad66070b9c8
diff --git a/solr/licenses/pdfbox-1.7.1.jar.sha1 b/solr/licenses/pdfbox-1.7.1.jar.sha1
deleted file mode 100644
index be61b40fddb..00000000000
--- a/solr/licenses/pdfbox-1.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b762c177f881e8aa095cf515df185191a123d949
diff --git a/solr/licenses/pdfbox-1.8.1.jar.sha1 b/solr/licenses/pdfbox-1.8.1.jar.sha1
new file mode 100644
index 00000000000..ea2e68625bf
--- /dev/null
+++ b/solr/licenses/pdfbox-1.8.1.jar.sha1
@@ -0,0 +1 @@
+2127ceef9eceffe4fefe445fa8eae4609c51e145
diff --git a/solr/licenses/poi-3.8.jar.sha1 b/solr/licenses/poi-3.8.jar.sha1
deleted file mode 100644
index a8115278b04..00000000000
--- a/solr/licenses/poi-3.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-552a7703d32c57adb611df084b45f7158e8653f3
diff --git a/solr/licenses/poi-3.9.jar.sha1 b/solr/licenses/poi-3.9.jar.sha1
new file mode 100644
index 00000000000..8dc4c71566d
--- /dev/null
+++ b/solr/licenses/poi-3.9.jar.sha1
@@ -0,0 +1 @@
+5d5e41354e88322e4bc590b31f3d2d1d52b3e6ac
diff --git a/solr/licenses/poi-ooxml-3.8.jar.sha1 b/solr/licenses/poi-ooxml-3.8.jar.sha1
deleted file mode 100644
index 9daaafac1d3..00000000000
--- a/solr/licenses/poi-ooxml-3.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-235d18adccc2b140fb3f90a2fa859b7ae29d57b8
diff --git a/solr/licenses/poi-ooxml-3.9.jar.sha1 b/solr/licenses/poi-ooxml-3.9.jar.sha1
new file mode 100644
index 00000000000..3425b0e0c66
--- /dev/null
+++ b/solr/licenses/poi-ooxml-3.9.jar.sha1
@@ -0,0 +1 @@
+bbe83c739d22eecfacd06d7e0b99ba13277040ed
diff --git a/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
deleted file mode 100644
index 9ade50e03a6..00000000000
--- a/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cb3b26809ec65eba22143acfddf654bcf70aa009
diff --git a/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1 b/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
new file mode 100644
index 00000000000..94341cee9e6
--- /dev/null
+++ b/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
@@ -0,0 +1 @@
+4c514498f0e82cccfdd3208b9caff2f45158db4a
diff --git a/solr/licenses/poi-scratchpad-3.8.jar.sha1 b/solr/licenses/poi-scratchpad-3.8.jar.sha1
deleted file mode 100644
index b952b556c09..00000000000
--- a/solr/licenses/poi-scratchpad-3.8.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33ef3eb7bd97c0dcdf2873b0e0a0938f013d410c
diff --git a/solr/licenses/poi-scratchpad-3.9.jar.sha1 b/solr/licenses/poi-scratchpad-3.9.jar.sha1
new file mode 100644
index 00000000000..ee48b1f34a3
--- /dev/null
+++ b/solr/licenses/poi-scratchpad-3.9.jar.sha1
@@ -0,0 +1 @@
+0f07d54f88a9f6c743d133be8d4446879a1e6729
diff --git a/solr/licenses/tika-core-1.3.jar.sha1 b/solr/licenses/tika-core-1.3.jar.sha1
deleted file mode 100644
index b1b31e03132..00000000000
--- a/solr/licenses/tika-core-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9d660bfa2881e3ee38d3e2e2e8d54bc448e8073a
diff --git a/solr/licenses/tika-core-1.4.jar.sha1 b/solr/licenses/tika-core-1.4.jar.sha1
new file mode 100644
index 00000000000..b22276e0dd1
--- /dev/null
+++ b/solr/licenses/tika-core-1.4.jar.sha1
@@ -0,0 +1 @@
+30fd5d2c4c21ed908d4b74064ac7f4f4fdbe9ae7
diff --git a/solr/licenses/tika-parsers-1.3.jar.sha1 b/solr/licenses/tika-parsers-1.3.jar.sha1
deleted file mode 100644
index a653f53197f..00000000000
--- a/solr/licenses/tika-parsers-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19bb1f65d52a41ef47583cd7deb0e4fcaf25cab9
diff --git a/solr/licenses/tika-parsers-1.4.jar.sha1 b/solr/licenses/tika-parsers-1.4.jar.sha1
new file mode 100644
index 00000000000..7179010353a
--- /dev/null
+++ b/solr/licenses/tika-parsers-1.4.jar.sha1
@@ -0,0 +1 @@
+58aba11789dc508f004e3352948394c9e395fb50