Author: markus
Date: Tue Feb 16 13:24:23 2016
New Revision: 1730686
URL: http://svn.apache.org/viewvc?rev=1730686&view=rev
Log:
NUTCH-2210 Upgrade to Tika 1.12
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/ivy/ivy.xml
nutch/trunk/src/plugin/parse-tika/ivy.xml
nutch/trunk/src/plugin/parse-tika/plugin.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1730686&r1=1730685&r2=1730686&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Feb 16 13:24:23 2016
@@ -1,5 +1,7 @@
Nutch Change Log
+* NUTCH-2210 Upgrade to Tika 1.12 (markus)
+
* NUTCH-2209 Improved Tokenization for Similarity Scoring plugin (Sujen)
* NUTCH-2211 Added filterchecker and normalizerchecker to bin/nutch script
(markus)
Modified: nutch/trunk/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=1730686&r1=1730685&r2=1730686&view=diff
==============================================================================
--- nutch/trunk/ivy/ivy.xml (original)
+++ nutch/trunk/ivy/ivy.xml Tue Feb 16 13:24:23 2016
@@ -65,7 +65,7 @@
<dependency org="org.apache.hadoop"
name="hadoop-mapreduce-client-jobclient" rev="2.4.0" conf="*->default"/>
<!-- End of Hadoop Dependencies -->
- <dependency org="org.apache.tika" name="tika-core" rev="1.11" />
+ <dependency org="org.apache.tika" name="tika-core" rev="1.12" />
<dependency org="com.ibm.icu" name="icu4j" rev="55.1" />
<dependency org="xerces" name="xercesImpl" rev="2.9.1" />
Modified: nutch/trunk/src/plugin/parse-tika/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-tika/ivy.xml?rev=1730686&r1=1730685&r2=1730686&view=diff
==============================================================================
--- nutch/trunk/src/plugin/parse-tika/ivy.xml (original)
+++ nutch/trunk/src/plugin/parse-tika/ivy.xml Tue Feb 16 13:24:23 2016
@@ -36,12 +36,11 @@
</publications>
<dependencies>
- <dependency org="org.apache.tika" name="tika-parsers" rev="1.11"
conf="*->default">
+ <dependency org="org.apache.tika" name="tika-parsers" rev="1.12"
conf="*->default">
<exclude org="org.apache.tika" name="tika-core" />
<exclude org="org.apache.httpcomponents" name="httpclient" />
<exclude org="org.apache.httpcomponents" name="httpcore" />
</dependency>
- <override module="rome" rev="0.9"/>
</dependencies>
</ivy-module>
Modified: nutch/trunk/src/plugin/parse-tika/plugin.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-tika/plugin.xml?rev=1730686&r1=1730685&r2=1730686&view=diff
==============================================================================
--- nutch/trunk/src/plugin/parse-tika/plugin.xml (original)
+++ nutch/trunk/src/plugin/parse-tika/plugin.xml Tue Feb 16 13:24:23 2016
@@ -53,6 +53,7 @@
<library name="fontbox-1.8.10.jar"/>
<library name="geoapi-3.0.0.jar"/>
<library name="grib-4.5.5.jar"/>
+ <library name="gson-2.2.4.jar"/>
<library name="guava-17.0.jar"/>
<library name="httpmime-4.2.6.jar"/>
<library name="httpservices-4.5.5.jar"/>
@@ -64,7 +65,7 @@
<library name="javax.ws.rs-api-2.0.1.jar"/>
<library name="jcip-annotations-1.0.jar"/>
<library name="jcommander-1.35.jar"/>
- <library name="jdom-1.0.jar"/>
+ <library name="jdom-2.0.2.jar"/>
<library name="jdom2-2.0.4.jar"/>
<library name="jempbox-1.8.10.jar"/>
<library name="jhighlight-1.0.2.jar"/>
@@ -95,7 +96,8 @@
<library name="protobuf-java-2.5.0.jar"/>
<library name="quartz-2.2.0.jar"/>
<library name="regexp-1.3.jar"/>
- <library name="rome-0.9.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"/>
@@ -104,7 +106,7 @@
<library name="slf4j-api-1.7.12.jar"/>
<library name="stax2-api-3.1.4.jar"/>
<library name="tagsoup-1.2.1.jar"/>
- <library name="tika-parsers-1.11.jar"/>
+ <library name="tika-parsers-1.12.jar"/>
<library name="udunits-4.5.5.jar"/>
<library name="vorbis-java-core-0.6.jar"/>
<library name="vorbis-java-tika-0.6.jar"/>
