svn commit: r1659532 - in /nutch/branches/2.x: CHANGES.txt ivy/ivy.xml src/plugin/parse-tika/ivy.xml src/plugin/parse-tika/plugin.xml

[markus]

Author: markus
Date: Fri Feb 13 12:25:13 2015
New Revision: 1659532

URL: http://svn.apache.org/r1659532
Log:
NUTCH-1925 Upgrade to Apache Tika 1.7

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/ivy/ivy.xml
    nutch/branches/2.x/src/plugin/parse-tika/ivy.xml
    nutch/branches/2.x/src/plugin/parse-tika/plugin.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1659532&r1=1659531&r2=1659532&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Fri Feb 13 12:25:13 2015
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Current Development 2.4-SNAPSHOT
 
+* NUTCH-1925 Upgrade to Apache Tika 1.7 (Tyler Palsulich via markus)
+
 * NUTCH-1924 Nutch + HBase Docker (Radosław Stankiewicz via lewismc)
 
 * NUTCH-1920 Upgrade Nutch to use Java 1.7 (lewismc)

Modified: nutch/branches/2.x/ivy/ivy.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1659532&r1=1659531&r2=1659532&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Fri Feb 13 12:25:13 2015
@@ -55,7 +55,7 @@
     </dependency>
 
     <dependency org="com.ibm.icu" name="icu4j" rev="4.0.1" />
-    <dependency org="org.apache.tika" name="tika-core" rev="1.6" />
+    <dependency org="org.apache.tika" name="tika-core" rev="1.7" />
     <dependency org="com.googlecode.juniversalchardet" 
name="juniversalchardet" rev="1.0.3"/>
 
     <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />

Modified: nutch/branches/2.x/src/plugin/parse-tika/ivy.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/parse-tika/ivy.xml?rev=1659532&r1=1659531&r2=1659532&view=diff
==============================================================================
--- nutch/branches/2.x/src/plugin/parse-tika/ivy.xml (original)
+++ nutch/branches/2.x/src/plugin/parse-tika/ivy.xml Fri Feb 13 12:25:13 2015
@@ -36,7 +36,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.apache.tika" name="tika-parsers" rev="1.6" 
conf="*->default">
+    <dependency org="org.apache.tika" name="tika-parsers" rev="1.7" 
conf="*->default">
      <exclude org="org.apache.tika" name="tika-core" />
     </dependency>
     <override module="rome" rev="0.9"/>

Modified: nutch/branches/2.x/src/plugin/parse-tika/plugin.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/parse-tika/plugin.xml?rev=1659532&r1=1659531&r2=1659532&view=diff
==============================================================================
--- nutch/branches/2.x/src/plugin/parse-tika/plugin.xml (original)
+++ nutch/branches/2.x/src/plugin/parse-tika/plugin.xml Fri Feb 13 12:25:13 2015
@@ -38,27 +38,27 @@
       <library name="commons-httpclient-3.1.jar"/>
       <library name="commons-logging-1.1.1.jar"/>
       <library name="dom4j-1.6.1.jar"/>
-      <library name="fontbox-1.8.6.jar"/>
+      <library name="fontbox-1.8.8.jar"/>
       <library name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
       <library name="isoparser-1.0.2.jar"/>
       <library name="java-libpst-0.8.1.jar"/>
       <library name="jcip-annotations-1.0.jar"/>
       <library name="jdom-1.0.jar"/>
-      <library name="jempbox-1.8.6.jar"/>
+      <library name="jempbox-1.8.8.jar"/>
       <library name="jhighlight-1.0.jar"/>
       <library name="jmatio-1.0.jar"/>
       <library name="juniversalchardet-1.0.3.jar"/>
       <library name="metadata-extractor-2.6.2.jar"/>
       <library name="netcdf-4.2.20.jar"/>
-      <library name="pdfbox-1.8.6.jar"/>
-      <library name="poi-3.11-beta2.jar"/>
-      <library name="poi-ooxml-3.11-beta2.jar"/>
-      <library name="poi-ooxml-schemas-3.11-beta2.jar"/>
-      <library name="poi-scratchpad-3.11-beta2.jar"/>
+      <library name="pdfbox-1.8.8.jar"/>
+      <library name="poi-3.11.jar"/>
+      <library name="poi-ooxml-3.11.jar"/>
+      <library name="poi-ooxml-schemas-3.11.jar"/>
+      <library name="poi-scratchpad-3.11.jar"/>
       <library name="rome-0.9.jar"/>
       <library name="slf4j-api-1.6.1.jar"/>
       <library name="tagsoup-1.2.1.jar"/>
-      <library name="tika-parsers-1.6.jar"/>
+      <library name="tika-parsers-1.7.jar"/>
       <library name="unidataCommon-4.2.20.jar"/>
       <library name="vorbis-java-core-0.6.jar"/>
       <library name="vorbis-java-tika-0.6.jar"/>