You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/06/18 17:09:04 UTC
[6/6] lucene-solr:master: SOLR-8981: Update TIKA to 1.13: - This
commit merges branch 'SOLR-8981' of https://github.com/tballison/lucene-solr
- Adds some modifications and reverts jackcess-encrypt addition (not yet
working) - Fixes order of ivy-versions.
SOLR-8981: Update TIKA to 1.13:
- This commit merges branch 'SOLR-8981' of https://github.com/tballison/lucene-solr
- Adds some modifications and reverts jackcess-encrypt addition (not yet working)
- Fixes order of ivy-versions.properties
- This closes #44
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/19cb7404
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/19cb7404
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/19cb7404
Branch: refs/heads/master
Commit: 19cb7404f5a592058ab4f675c11eea359ac8fdc3
Parents: 2cd77c7 dd09f0f
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Jun 18 10:41:55 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Jun 18 12:23:28 2016 +0200
----------------------------------------------------------------------
lucene/ivy-versions.properties | 18 +-
lucene/licenses/commons-compress-1.11.jar.sha1 | 1 +
lucene/licenses/commons-compress-1.8.1.jar.sha1 | 1 -
solr/CHANGES.txt | 2 +-
solr/NOTICE.txt | 3 +
.../dataimport/TestTikaEntityProcessor.java | 2 -
solr/contrib/extraction/ivy.xml | 3 +
.../extraction/ExtractingDocumentLoader.java | 4 +-
.../ExtractingRequestHandlerTest.java | 2 -
.../morphlines/cell/SolrCellMorphlineTest.java | 2 +-
solr/licenses/commons-compress-1.11.jar.sha1 | 1 +
solr/licenses/commons-compress-1.8.1.jar.sha1 | 1 -
solr/licenses/fontbox-1.8.8.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.1.jar.sha1 | 1 +
solr/licenses/isoparser-1.0.2.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.18.jar.sha1 | 1 +
solr/licenses/jackcess-2.1.3.jar.sha1 | 1 +
solr/licenses/jackcess-LICENSE-ASL.txt | 507 +++++++++++++++++++
solr/licenses/jackcess-NOTICE.txt | 1 +
solr/licenses/jempbox-1.8.12.jar.sha1 | 1 +
solr/licenses/jempbox-1.8.8.jar.sha1 | 1 -
solr/licenses/metadata-extractor-2.6.2.jar.sha1 | 1 -
solr/licenses/metadata-extractor-2.8.1.jar.sha1 | 1 +
solr/licenses/pdfbox-1.8.8.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.1.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.1.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-LICENSE-ASL.txt | 314 ++++++++++++
solr/licenses/pdfbox-tools-NOTICE.txt | 14 +
solr/licenses/poi-3.11.jar.sha1 | 1 -
solr/licenses/poi-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.11.jar.sha1 | 1 -
solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-schemas-3.11.jar.sha1 | 1 -
.../poi-ooxml-schemas-3.15-beta1.jar.sha1 | 1 +
solr/licenses/poi-scratchpad-3.11.jar.sha1 | 1 -
.../licenses/poi-scratchpad-3.15-beta1.jar.sha1 | 1 +
solr/licenses/tika-core-1.13.jar.sha1 | 1 +
solr/licenses/tika-core-1.7.jar.sha1 | 1 -
solr/licenses/tika-java7-1.13.jar.sha1 | 1 +
solr/licenses/tika-java7-1.7.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.13.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.7.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.13.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.7.jar.sha1 | 1 -
solr/licenses/vorbis-java-core-0.6.jar.sha1 | 1 -
solr/licenses/vorbis-java-core-0.8.jar.sha1 | 1 +
solr/licenses/vorbis-java-tika-0.6.jar.sha1 | 1 -
solr/licenses/vorbis-java-tika-0.8.jar.sha1 | 1 +
48 files changed, 876 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19cb7404/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --cc lucene/ivy-versions.properties
index a4e1bb1,e61f839..1b455d5
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@@ -38,7 -38,9 +38,8 @@@ com.google.inject.guice.version = 3.
/com.google.protobuf/protobuf-java = 2.5.0
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
- /com.googlecode.mp4parser/isoparser = 1.0.2
+ /com.googlecode.mp4parser/isoparser = 1.1.18
+ /com.healthmarketscience.jackcess/jackcess = 2.1.3
-/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.1
/com.ibm.icu/icu4j = 56.1
/com.pff/java-libpst = 0.8.1
@@@ -173,12 -175,15 +174,13 @@@ org.apache.james.apache.mime4j.version
/org.apache.mina/mina-core = 2.0.0-M5
/org.apache.mrunit/mrunit = 1.0.0
- org.apache.pdfbox.version = 1.8.8
+ org.apache.pdfbox.version = 2.0.1
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
- /org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
++/org.apache.pdfbox/jempbox = 1.8.12
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
+ /org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
- org.apache.poi.version = 3.11
+ org.apache.poi.version = 3.15-beta1
/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}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19cb7404/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
----------------------------------------------------------------------
diff --cc solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
index 58b6485,ebf8ae3..fe769bc
--- a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
@@@ -16,7 -16,7 +16,6 @@@
*/
package org.apache.solr.handler.dataimport;
--import org.apache.lucene.util.Constants;
import org.junit.BeforeClass;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19cb7404/solr/contrib/extraction/ivy.xml
----------------------------------------------------------------------
diff --cc solr/contrib/extraction/ivy.xml
index 8fafb0a,1bb5f95..5cf19a1
--- a/solr/contrib/extraction/ivy.xml
+++ b/solr/contrib/extraction/ivy.xml
@@@ -32,6 -32,8 +32,7 @@@
<!-- When upgrading Tika, upgrade dependencies versions and add any new ones
(except slf4j-api, commons-codec, commons-logging, commons-httpclient, geronimo-stax-api_1.0_spec, jcip-annotations, xml-apis, asm)
WARNING: Don't add netcdf / unidataCommon (partially LGPL code) -->
+ <dependency org="com.healthmarketscience.jackcess" name="jackcess" rev="${/com.healthmarketscience.jackcess/jackcess}" conf="compile"/>
- <dependency org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="${/com.healthmarketscience.jackcess/jackcess-encrypt}" conf="compile"/>
<dependency org="org.gagravarr" name="vorbis-java-tika" rev="${/org.gagravarr/vorbis-java-tika}" conf="compile"/>
<dependency org="org.gagravarr" name="vorbis-java-core" rev="${/org.gagravarr/vorbis-java-core}" conf="compile"/>
<dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" conf="compile"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19cb7404/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
----------------------------------------------------------------------
diff --cc solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
index 23ca28a,8a91319..a53bcd9
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
@@@ -19,7 -19,7 +19,6 @@@ import java.util.ArrayList
import java.util.List;
import java.util.Locale;
--import org.apache.lucene.util.Constants;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ContentStream;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19cb7404/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
----------------------------------------------------------------------
diff --cc solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
index 2cdbd3c,be75f1b..4d63eed
--- a/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
+++ b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
@@@ -42,8 -42,6 +42,8 @@@ public class SolrCellMorphlineTest exte
@BeforeClass
public static void beforeClass2() {
assumeFalse("FIXME: Morphlines currently has issues with Windows paths", Constants.WINDOWS);
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155, https://issues.apache.org/jira/browse/SOLR-8876)",
++ assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/SOLR-8876)",
+ Constants.JRE_IS_MINIMUM_JAVA9);
}
@Before