You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/03/19 01:51:14 UTC
svn commit: r1579102 - in /lucene/dev/branches/branch_4x: ./ lucene/ solr/
solr/contrib/ solr/contrib/extraction/ solr/licenses/
Author: sarowe
Date: Wed Mar 19 00:51:13 2014
New Revision: 1579102
URL: http://svn.apache.org/r1579102
Log:
SOLR-5763: Upgrade to Tika 1.5 (merged trunk r1579100)
Added:
lucene/dev/branches/branch_4x/solr/licenses/fontbox-1.8.4.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/fontbox-1.8.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/jempbox-1.8.4.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/jempbox-1.8.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/pdfbox-1.8.4.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/pdfbox-1.8.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-3.10-beta2.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/poi-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-core-1.5.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/tika-core-1.5.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-parsers-1.5.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/tika-parsers-1.5.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-xmp-1.5.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/tika-xmp-1.5.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/xz-1.2.jar.sha1
- copied unchanged from r1579100, lucene/dev/trunk/solr/licenses/xz-1.2.jar.sha1
Removed:
lucene/dev/branches/branch_4x/solr/licenses/fontbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/jempbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/pdfbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-core-1.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-parsers-1.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-xmp-1.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/xz-1.0.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1579102&r1=1579101&r2=1579102&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Wed Mar 19 00:51:13 2014
@@ -121,18 +121,18 @@ org.apache.james.apache.mime4j.version =
/org.apache.mahout/mahout-math = 0.6
/org.apache.mrunit/mrunit = 1.0.0
-org.apache.pdfbox.version = 1.8.1
+org.apache.pdfbox.version = 1.8.4
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
-org.apache.poi.version = 3.9
+org.apache.poi.version = 3.10-beta2
/org.apache.poi/poi = ${org.apache.poi.version}
/org.apache.poi/poi-ooxml = ${org.apache.poi.version}
/org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
/org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
-org.apache.tika.version = 1.4
+org.apache.tika.version = 1.5
/org.apache.tika/tika-core = ${org.apache.tika.version}
/org.apache.tika/tika-parsers = ${org.apache.tika.version}
/org.apache.tika/tika-xmp = ${org.apache.tika.version}
@@ -226,7 +226,7 @@ org.slf4j.version = 1.7.6
/org.slf4j/slf4j-api = ${org.slf4j.version}
/org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
-/org.tukaani/xz = 1.0
+/org.tukaani/xz = 1.2
/org.xerial.snappy/snappy-java = 1.0.4.1
/rome/rome = 0.9
/xerces/xercesImpl = 2.9.1
Modified: lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml?rev=1579102&r1=1579101&r2=1579102&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml Wed Mar 19 00:51:13 2014
@@ -53,10 +53,7 @@
<dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
<dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" transitive="false"/>
<dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" transitive="false"/>
<dependency org="asm" name="asm" rev="${/asm/asm}" transitive="false"/>
- <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
<!-- Other ExtracingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>