Merge pull request #259 from sebastian-nagel/nutch-2439-upgrade-tika-…

…1.17 NUTCH-2439 Upgrade Apache Tika dependency to 1.17
apache · Dec 15, 2017 · f6bd25b · f6bd25b
2 parents df14c8a + 7f2c809
commit f6bd25b
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 56 deletions.
diff --git a/conf/nutch-default.xml b/conf/nutch-default.xml
@@ -1406,6 +1406,12 @@ CAUTION: Set the parser.timeout to -1 or a bigger value than 30, when using this
 </property>
 -->
 
+<property>
+ <name>tika.config.file</name>
+ <value>tika-config.xml</value>
+ <description>Nutch-specific Tika config file</description>
+</property>
+
 <property>
   <name>tika.uppercase.element.names</name>
   <value>true</value>

diff --git a/conf/tika-config.xml.template b/conf/tika-config.xml.template
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<properties>
+    <service-loader initializableProblemHandler="ignore"/>
+</properties>
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
@@ -47,7 +47,7 @@
 		<dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="*->master" />
 		<dependency org="commons-httpclient" name="commons-httpclient" rev="3.1" conf="*->master" />
 		<dependency org="commons-codec" name="commons-codec" rev="1.10" conf="*->default" />
-		<dependency org="org.apache.commons" name="commons-compress" rev="1.9" conf="*->default" />
+		<dependency org="org.apache.commons" name="commons-compress" rev="1.14" conf="*->default" />
 		<dependency org="org.apache.commons" name="commons-jexl" rev="2.1.1" />
 		<dependency org="com.tdunning" name="t-digest" rev="3.2" />
 
@@ -65,7 +65,7 @@
         <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="2.7.2" conf="*->default"/>
         <!-- End of Hadoop Dependencies -->
 
-		<dependency org="org.apache.tika" name="tika-core" rev="1.12" />
+		<dependency org="org.apache.tika" name="tika-core" rev="1.17" />
 		<dependency org="com.ibm.icu" name="icu4j" rev="55.1" />
 
 		<dependency org="xerces" name="xercesImpl" rev="2.11.0" />

diff --git a/src/plugin/parse-tika/ivy.xml b/src/plugin/parse-tika/ivy.xml
@@ -36,11 +36,14 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.apache.tika" name="tika-parsers" rev="1.12" conf="*->default">
+    <dependency org="org.apache.tika" name="tika-parsers" rev="1.17" conf="*->default">
       <exclude org="org.apache.tika" name="tika-core" />
       <exclude org="org.apache.httpcomponents" name="httpclient" />
       <exclude org="org.apache.httpcomponents" name="httpcore" />
       <exclude org="org.slf4j" name="slf4j-log4j12" />
+      <exclude org="org.slf4j" name="slf4j-api" />
+      <exclude org="commons-lang" name="commons-lang" />
+      <exclude org="com.google.protobuf" name="protobuf-java" />
     </dependency>
   </dependencies>
 

diff --git a/src/plugin/parse-tika/plugin.xml b/src/plugin/parse-tika/plugin.xml
@@ -25,95 +25,87 @@
       <library name="parse-tika.jar">
          <export name="*"/>
       </library>
-      <library name="apache-mime4j-core-0.7.2.jar"/>
-      <library name="apache-mime4j-dom-0.7.2.jar"/>
+      <library name="apache-mime4j-core-0.8.1.jar"/>
+      <library name="apache-mime4j-dom-0.8.1.jar"/>
       <library name="asm-5.0.4.jar"/>
-      <library name="aspectjrt-1.8.0.jar"/>
-      <library name="bcmail-jdk15on-1.52.jar"/>
-      <library name="bcpkix-jdk15on-1.52.jar"/>
-      <library name="bcprov-jdk15on-1.52.jar"/>
+      <library name="bcmail-jdk15on-1.54.jar"/>
+      <library name="bcpkix-jdk15on-1.54.jar"/>
+      <library name="bcprov-jdk15on-1.54.jar"/>
       <library name="boilerpipe-1.1.0.jar"/>
       <library name="bzip2-0.9.1.jar"/>
       <library name="c3p0-0.9.1.1.jar"/>
       <library name="cdm-4.5.5.jar"/>
       <library name="commons-codec-1.6.jar"/>
-      <library name="commons-compress-1.10.jar"/>
+      <library name="commons-collections4-4.1.jar"/>
+      <library name="commons-compress-1.14.jar"/>
       <library name="commons-csv-1.0.jar"/>
       <library name="commons-exec-1.3.jar"/>
-      <library name="commons-io-2.4.jar"/>
-      <library name="commons-lang-2.6.jar"/>
-      <library name="commons-logging-1.1.3.jar"/>
-      <library name="commons-logging-api-1.1.jar"/>
-      <library name="commons-vfs2-2.0.jar"/>
-      <library name="cxf-core-3.0.3.jar"/>
-      <library name="cxf-rt-frontend-jaxrs-3.0.3.jar"/>
-      <library name="cxf-rt-rs-client-3.0.3.jar"/>
-      <library name="cxf-rt-transports-http-3.0.3.jar"/>
+      <library name="commons-io-2.5.jar"/>
+      <library name="curvesapi-1.04.jar"/>
+      <library name="cxf-core-3.0.16.jar"/>
+      <library name="cxf-rt-frontend-jaxrs-3.0.16.jar"/>
+      <library name="cxf-rt-rs-client-3.0.16.jar"/>
+      <library name="cxf-rt-transports-http-3.0.16.jar"/>
       <library name="ehcache-core-2.6.2.jar"/>
-      <library name="fontbox-1.8.10.jar"/>
+      <library name="fontbox-2.0.8.jar"/>
       <library name="geoapi-3.0.0.jar"/>
       <library name="grib-4.5.5.jar"/>
-      <library name="gson-2.2.4.jar"/>
+      <library name="gson-2.8.1.jar"/>
       <library name="guava-17.0.jar"/>
-      <library name="httpmime-4.2.6.jar"/>
+      <library name="httpmime-4.5.4.jar"/>
       <library name="httpservices-4.5.5.jar"/>
-      <library name="isoparser-1.0.2.jar"/>
-      <library name="jackcess-2.1.2.jar"/>
-      <library name="jackcess-encrypt-2.1.1.jar"/>
+      <library name="isoparser-1.1.18.jar"/>
+      <library name="jackcess-2.1.8.jar"/>
+      <library name="jackcess-encrypt-2.1.2.jar"/>
+      <library name="jackson-core-2.9.2.jar"/>
       <library name="java-libpst-0.8.1.jar"/>
       <library name="javax.annotation-api-1.2.jar"/>
       <library name="javax.ws.rs-api-2.0.1.jar"/>
       <library name="jcip-annotations-1.0.jar"/>
+      <library name="jcl-over-slf4j-1.7.24.jar"/>
       <library name="jcommander-1.35.jar"/>
-      <library name="jdom-2.0.2.jar"/>
       <library name="jdom2-2.0.4.jar"/>
-      <library name="jempbox-1.8.10.jar"/>
+      <library name="jempbox-1.8.13.jar"/>
       <library name="jhighlight-1.0.2.jar"/>
-      <library name="jj2000-5.2.jar"/>
-      <library name="jmatio-1.0.jar"/>
+      <library name="jmatio-1.2.jar"/>
       <library name="jna-4.1.0.jar"/>
       <library name="joda-time-2.2.jar"/>
-      <library name="json-20140107.jar"/>
+      <library name="json-1.8.jar"/>
       <library name="json-simple-1.1.1.jar"/>
       <library name="jsoup-1.7.2.jar"/>
       <library name="jsr-275-0.9.3.jar"/>
+      <library name="jul-to-slf4j-1.7.24.jar"/>
       <library name="juniversalchardet-1.0.3.jar"/>
       <library name="junrar-0.7.jar"/>
-      <library name="jwnl-1.3.3.jar"/>
-      <library name="maven-scm-api-1.4.jar"/>
-      <library name="maven-scm-provider-svn-commons-1.4.jar"/>
-      <library name="maven-scm-provider-svnexe-1.4.jar"/>
-      <library name="metadata-extractor-2.8.0.jar"/>
+      <library name="metadata-extractor-2.10.1.jar"/>
       <library name="netcdf4-4.5.5.jar"/>
-      <library name="opennlp-maxent-3.0.3.jar"/>
-      <library name="opennlp-tools-1.5.3.jar"/>
-      <library name="pdfbox-1.8.10.jar"/>
-      <library name="plexus-utils-1.5.6.jar"/>
-      <library name="poi-3.13.jar"/>
-      <library name="poi-ooxml-3.13.jar"/>
-      <library name="poi-ooxml-schemas-3.13.jar"/>
-      <library name="poi-scratchpad-3.13.jar"/>
-      <library name="protobuf-java-2.5.0.jar"/>
+      <library name="opennlp-tools-1.8.3.jar"/>
+      <library name="pdfbox-2.0.8.jar"/>
+      <library name="pdfbox-tools-2.0.8.jar"/>
+      <library name="poi-3.17.jar"/>
+      <library name="poi-ooxml-3.17.jar"/>
+      <library name="poi-ooxml-schemas-3.17.jar"/>
+      <library name="poi-scratchpad-3.17.jar"/>
       <library name="quartz-2.2.0.jar"/>
-      <library name="regexp-1.3.jar"/>
       <library name="rome-1.5.1.jar"/>
       <library name="rome-utils-1.5.1.jar"/>
-      <library name="sis-metadata-0.5.jar"/>
-      <library name="sis-netcdf-0.5.jar"/>
-      <library name="sis-referencing-0.5.jar"/>
-      <library name="sis-storage-0.5.jar"/>
-      <library name="sis-utility-0.5.jar"/>
+      <library name="sentiment-analysis-parser-0.1.jar"/>
+      <library name="sis-metadata-0.6.jar"/>
+      <library name="sis-netcdf-0.6.jar"/>
+      <library name="sis-referencing-0.6.jar"/>
+      <library name="sis-storage-0.6.jar"/>
+      <library name="sis-utility-0.6.jar"/>
       <library name="stax2-api-3.1.4.jar"/>
       <library name="tagsoup-1.2.1.jar"/>
-      <library name="tika-parsers-1.12.jar"/>
+      <library name="tika-parsers-1.17.jar"/>
       <library name="udunits-4.5.5.jar"/>
-      <library name="vorbis-java-core-0.6.jar"/>
-      <library name="vorbis-java-tika-0.6.jar"/>
+      <library name="vorbis-java-core-0.8.jar"/>
+      <library name="vorbis-java-tika-0.8.jar"/>
       <library name="woodstox-core-asl-4.4.1.jar"/>
       <library name="xmlbeans-2.6.0.jar"/>
-      <library name="xmlschema-core-2.1.0.jar"/>
-      <library name="xmpcore-5.1.2.jar"/>
-      <library name="xz-1.5.jar"/>
+      <library name="xmlschema-core-2.2.2.jar"/>
+      <library name="xmpcore-5.1.3.jar"/>
+      <library name="xz-1.6.jar"/>
    </runtime>
 
    <requires>