[nutch] branch 2.x updated: NUTCH-2667 Update Tika and Commons Collections 4 - explicitly add dependency to commons-compress 1.18 for tika-core

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snagel pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/nutch.git


The following commit(s) were added to refs/heads/2.x by this push:
     new 90dede9  NUTCH-2667 Update Tika and Commons Collections 4 - explicitly add dependency to commons-compress 1.18 for tika-core
90dede9 is described below

commit 90dede99e8bed4dbbad9907fe9330212bf216fd4
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Fri Jan 4 15:17:55 2019 +0100

    NUTCH-2667 Update Tika and Commons Collections 4
    - explicitly add dependency to commons-compress 1.18 for tika-core
---
 ivy/ivy.xml                      | 2 ++
 src/plugin/parse-tika/ivy.xml    | 1 +
 src/plugin/parse-tika/plugin.xml | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index 14865b6..322eecb 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -62,6 +62,8 @@
 
     <dependency org="com.ibm.icu" name="icu4j" rev="55.1" />
     <dependency org="org.apache.tika" name="tika-core" rev="1.20" />
+    <!-- Tika requires a recent version of commons-compress -->
+    <dependency org="org.apache.commons" name="commons-compress" rev="1.18" conf="*->default" />
     <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="1.0.3"/>
 
     <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />
diff --git a/src/plugin/parse-tika/ivy.xml b/src/plugin/parse-tika/ivy.xml
index 8811868..738498a 100644
--- a/src/plugin/parse-tika/ivy.xml
+++ b/src/plugin/parse-tika/ivy.xml
@@ -44,6 +44,7 @@
       <exclude org="org.slf4j" name="slf4j-api" />
       <exclude org="commons-lang" name="commons-lang" />
       <exclude org="commons-codec" name="commons-codec" />
+      <exclude org="org.apache.commons" name="commons-compress" />
       <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
index b68539b..6559688 100644
--- a/src/plugin/parse-tika/plugin.xml
+++ b/src/plugin/parse-tika/plugin.xml
@@ -37,9 +37,7 @@
       <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.11.jar"/>
       <library name="commons-collections4-4.2.jar"/>
-      <library name="commons-compress-1.18.jar"/>
       <library name="commons-csv-1.6.jar"/>
       <library name="commons-exec-1.3.jar"/>
       <library name="commons-io-2.6.jar"/>