From 3fb806830e24060e061f0236af54861cf3f609fa Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <snagel@apache.org>
Date: Fri, 28 Mar 2025 09:19:08 +0100
Subject: [PATCH 1/2] NUTCH-3110 Upgrade to Tika 3.1.0

Upgrade to shaded Tika packages 3.1.0.0 provided by Tim Allison.
The shaded packages are required to avoid version conflicts when
running in distributed mode caused by incompatible versions of
the commons-io jar shipped with Hadoop and required by Tika,
cf. NUTCH-2959.
---
 ivy/ivy.xml                               | 2 +-
 src/plugin/language-identifier/ivy.xml    | 2 +-
 src/plugin/language-identifier/plugin.xml | 2 +-
 src/plugin/parse-tika/ivy.xml             | 2 +-
 src/plugin/parse-tika/plugin.xml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index f402d8365c..70614f8fd6 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -74,7 +74,7 @@
 			<exclude org="org.slf4j" name="*" />
 		</dependency><!-- End of Hadoop Dependencies -->
 
-		<dependency org="org.tallison.tika" name="tika-core-shaded" rev="2.9.1.0" conf="*->default" transitive="false"/>
+		<dependency org="org.tallison.tika" name="tika-core-shaded" rev="3.1.0.0" conf="*->default" transitive="false"/>
 
 		<dependency org="xml-apis" name="xml-apis" rev="1.4.01" /><!-- force this version as it is required by Tika -->
 		<dependency org="xerces" name="xercesImpl" rev="2.12.2" />
diff --git a/src/plugin/language-identifier/ivy.xml b/src/plugin/language-identifier/ivy.xml
index 17aba47e92..149d6c1479 100644
--- a/src/plugin/language-identifier/ivy.xml
+++ b/src/plugin/language-identifier/ivy.xml
@@ -37,7 +37,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.tallison.tika" name="tika-langdetect-optimaize-shaded" rev="2.9.1.0" conf="*->default" transitive="false"/>
+    <dependency org="org.tallison.tika" name="tika-langdetect-optimaize-shaded" rev="3.1.0.0" conf="*->default" transitive="false"/>
   </dependencies>
   
 </ivy-module>
diff --git a/src/plugin/language-identifier/plugin.xml b/src/plugin/language-identifier/plugin.xml
index 94929bdbfa..a4625d0603 100644
--- a/src/plugin/language-identifier/plugin.xml
+++ b/src/plugin/language-identifier/plugin.xml
@@ -26,7 +26,7 @@
          <export name="*"/>
       </library>
       <!-- dependencies of Tika's Optimaize language detector (tika-langdetect-optimaize) -->
-      <library name="tika-langdetect-optimaize-shaded-2.9.1.0.jar"/>
+      <library name="tika-langdetect-optimaize-shaded-3.1.0.0.jar"/>
     </runtime>
 
    <requires>
diff --git a/src/plugin/parse-tika/ivy.xml b/src/plugin/parse-tika/ivy.xml
index 6d96ed3cd9..f4aa049a9a 100644
--- a/src/plugin/parse-tika/ivy.xml
+++ b/src/plugin/parse-tika/ivy.xml
@@ -37,7 +37,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.tallison.tika" name="tika-parsers-standard-package-shaded" rev="2.9.1.0" conf="*->default" transitive="false"/>
+    <dependency org="org.tallison.tika" name="tika-parsers-standard-package-shaded" rev="3.1.0.0" conf="*->default" transitive="false"/>
   </dependencies>
   
 </ivy-module>
diff --git a/src/plugin/parse-tika/plugin.xml b/src/plugin/parse-tika/plugin.xml
index 04afb9faca..8761748932 100644
--- a/src/plugin/parse-tika/plugin.xml
+++ b/src/plugin/parse-tika/plugin.xml
@@ -25,7 +25,7 @@
       <library name="parse-tika.jar">
          <export name="*"/>
       </library>
-      <library name="tika-parsers-standard-package-shaded-2.9.1.0.jar"/>
+      <library name="tika-parsers-standard-package-shaded-3.1.0.0.jar"/>
    </runtime>
 
    <requires>

From 76ced9b18f9af04764a23ffa9ac811a70517da0f Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <snagel@apache.org>
Date: Fri, 28 Mar 2025 09:28:10 +0100
Subject: [PATCH 2/2] NUTCH-3110 Upgrade to Tika 3.1.0

Add "text/javascript" as MIME type supported by "parse-js".
Note: fixes parse-js unit tests. Tika 3.1.0 identifies
the Javascript test document as "text/javascript" instead of
"application/javascript".
---
 src/plugin/parse-js/plugin.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugin/parse-js/plugin.xml b/src/plugin/parse-js/plugin.xml
index e55195a460..ac044ce7ca 100644
--- a/src/plugin/parse-js/plugin.xml
+++ b/src/plugin/parse-js/plugin.xml
@@ -36,7 +36,7 @@
               point="org.apache.nutch.parse.Parser">
       <implementation id="JSParser"
          class="org.apache.nutch.parse.js.JSParseFilter">
-        <parameter name="contentType" value="application/x-javascript|application/javascript"/>
+        <parameter name="contentType" value="(?:application/(?:x-)?|text/)javascript"/>
         <parameter name="pathSuffix"  value="js"/>
       </implementation>
    </extension>
@@ -45,7 +45,7 @@
               point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="JSParseFilter"
          class="org.apache.nutch.parse.js.JSParseFilter">
-        <parameter name="contentType" value="application/x-javascript|application/javascript"/>
+        <parameter name="contentType" value="(?:application/(?:x-)?|text/)javascript"/>
         <parameter name="pathSuffix"  value=""/>
       </implementation>
    </extension>