You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2013/07/03 14:06:50 UTC
svn commit: r1499349 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/maven/ solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/
Author: janhoy
Date: Wed Jul 3 12:06:50 2013
New Revision: 1499349
URL: http://svn.apache.org/r1499349
Log:
SOLR-4986: Upgrade to Tika 1.4 (merge from trunk)
Added:
lucene/dev/branches/branch_4x/solr/licenses/fontbox-1.8.1.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/jempbox-1.8.1.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/pdfbox-1.8.1.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-3.9.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.9.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.9.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-core-1.4.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-parsers-1.4.jar.sha1
- copied unchanged from r1499338, lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1
Removed:
lucene/dev/branches/branch_4x/solr/licenses/fontbox-1.7.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/jempbox-1.7.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/pdfbox-1.7.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-3.8.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.8.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.8.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-core-1.3.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/tika-parsers-1.3.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, 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/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1499349&r1=1499348&r2=1499349&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Wed Jul 3 12:06:50 2013
@@ -47,7 +47,7 @@
<jetty.version>8.1.10.v20130312</jetty.version>
<slf4j.version>1.6.6</slf4j.version>
<log4j.version>1.2.16</log4j.version>
- <tika.version>1.3</tika.version>
+ <tika.version>1.4</tika.version>
<httpcomponents.version>4.2.3</httpcomponents.version>
<commons-io.version>2.1</commons-io.version>
<restlet.version>2.1.1</restlet.version>
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1499349&r1=1499348&r2=1499349&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jul 3 12:06:50 2013
@@ -24,7 +24,7 @@ $Id$
Versions of Major Components
---------------------
-Apache Tika 1.3
+Apache Tika 1.4
Carrot2 3.6.2
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -273,6 +273,8 @@ Other Changes
* SOLR-4966: CSS, JS and other files in webapp without license (uschindler,
steffkes)
+* SOLR-4986: Upgrade to Tika 1.4 (Markus Jelsma via janhoy)
+
================== 4.3.1 ==================
Versions of Major Components
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=1499349&r1=1499348&r2=1499349&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml Wed Jul 3 12:06:50 2013
@@ -20,8 +20,8 @@
<info organisation="org.apache.solr" module="extraction"/>
<dependencies>
<!-- Tika JARs -->
- <dependency org="org.apache.tika" name="tika-core" rev="1.3" transitive="false"/>
- <dependency org="org.apache.tika" name="tika-parsers" rev="1.3" transitive="false"/>
+ <dependency org="org.apache.tika" name="tika-core" rev="1.4" transitive="false"/>
+ <dependency org="org.apache.tika" name="tika-parsers" rev="1.4" transitive="false"/>
<!-- Tika dependencies - see http://tika.apache.org/1.3/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
<!-- When upgrading Tika, upgrade dependencies versions and add any new ones
(except slf4j-api, commons-codec, commons-logging, geronimo-stax-api_1.0_spec) -->
@@ -31,15 +31,15 @@
<dependency org="org.apache.james" name="apache-mime4j-core" rev="0.7.2" transitive="false"/>
<dependency org="org.apache.james" name="apache-mime4j-dom" rev="0.7.2" transitive="false"/>
<dependency org="org.apache.commons" name="commons-compress" rev="1.4.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.7.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="fontbox" rev="1.7.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="jempbox" rev="1.7.1" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.8.1" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="fontbox" rev="1.8.1" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="jempbox" rev="1.8.1" transitive="false"/>
<dependency org="org.bouncycastle" name="bcmail-jdk15" rev="1.45" transitive="false"/>
<dependency org="org.bouncycastle" name="bcprov-jdk15" rev="1.45" transitive="false"/>
- <dependency org="org.apache.poi" name="poi" rev="3.8" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.8" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml" rev="3.8" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="3.8" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi" rev="3.9" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.9" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-ooxml" rev="3.9" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="3.9" transitive="false"/>
<dependency org="org.apache.xmlbeans" name="xmlbeans" rev="2.3.0" transitive="false"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
<dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="1.2.1" transitive="false"/>