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 13:49:59 UTC
svn commit: r1499338 - in /lucene/dev/trunk: dev-tools/maven/ solr/
solr/contrib/extraction/ solr/licenses/
Author: janhoy
Date: Wed Jul 3 11:49:59 2013
New Revision: 1499338
URL: http://svn.apache.org/r1499338
Log:
SOLR-4986: Upgrade to Tika 1.4
Added:
lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1 (with props)
Removed:
lucene/dev/trunk/solr/licenses/fontbox-1.7.1.jar.sha1
lucene/dev/trunk/solr/licenses/jempbox-1.7.1.jar.sha1
lucene/dev/trunk/solr/licenses/pdfbox-1.7.1.jar.sha1
lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/tika-core-1.3.jar.sha1
lucene/dev/trunk/solr/licenses/tika-parsers-1.3.jar.sha1
Modified:
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/extraction/ivy.xml
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1499338&r1=1499337&r2=1499338&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Wed Jul 3 11:49:59 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/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1499338&r1=1499337&r2=1499338&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jul 3 11:49:59 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
@@ -53,7 +53,7 @@ Other Changes
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
@@ -302,6 +302,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/trunk/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/ivy.xml?rev=1499338&r1=1499337&r2=1499338&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/ivy.xml Wed Jul 3 11:49:59 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"/>
Added: lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/fontbox-1.8.1.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+32879bb6bb87b15c6d53bc358e83ede40fc729ae
Added: lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jempbox-1.8.1.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+1a34de98c20293b07474aa17cb05dad66070b9c8
Added: lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/pdfbox-1.8.1.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+2127ceef9eceffe4fefe445fa8eae4609c51e145
Added: lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-3.9.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+5d5e41354e88322e4bc590b31f3d2d1d52b3e6ac
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-3.9.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+bbe83c739d22eecfacd06d7e0b99ba13277040ed
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.9.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+4c514498f0e82cccfdd3208b9caff2f45158db4a
Added: lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-scratchpad-3.9.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+0f07d54f88a9f6c743d133be8d4446879a1e6729
Added: lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-core-1.4.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+30fd5d2c4c21ed908d4b74064ac7f4f4fdbe9ae7
Added: lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1?rev=1499338&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-parsers-1.4.jar.sha1 Wed Jul 3 11:49:59 2013
@@ -0,0 +1 @@
+58aba11789dc508f004e3352948394c9e395fb50