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:02 UTC
[4/6] lucene-solr:master: SOLR-8981 remove "don't test with java-9"
commands;
fix bug introduced by TIKA-995 -- doubling of body elements in HTML tags;
add copyright info for Jackcess.
SOLR-8981 remove "don't test with java-9" commands; fix bug introduced by TIKA-995 -- doubling of body elements in HTML tags; add copyright info for Jackcess.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/785bebbc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/785bebbc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/785bebbc
Branch: refs/heads/master
Commit: 785bebbcbd8f77ccc6d75acf3fb3d42ee29770fc
Parents: 31c091b
Author: tballison <ta...@mitre.org>
Authored: Fri Jun 17 14:40:21 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Jun 17 14:40:21 2016 -0400
----------------------------------------------------------------------
solr/NOTICE.txt | 3 +++
.../apache/solr/handler/dataimport/TestTikaEntityProcessor.java | 1 -
.../apache/solr/handler/extraction/ExtractingDocumentLoader.java | 4 +++-
.../solr/handler/extraction/ExtractingRequestHandlerTest.java | 1 -
.../org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java | 2 --
5 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/785bebbc/solr/NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt
index 25e2aa3..e147285 100644
--- a/solr/NOTICE.txt
+++ b/solr/NOTICE.txt
@@ -61,6 +61,9 @@ Copyright (C) 2010-2014 James Burke, https://github.com/jrburke/requirejs
This product includes fugue icons created by Yusuke Kamiyamane
Copyright (C) 2013-2014 Yusuke Kamiyamane, https://github.com/yusukekamiyamane/fugue-icons
+Jackcess: http://jackcess.sourceforge.net/
+Copyright (C) 2011-2014 James Ahlborn
+
JavaMail API 1.5.1: https://glassfish.dev.java.net/javaee5/mail/
License: Common Development and Distribution License (CDDL) v1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/785bebbc/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
----------------------------------------------------------------------
diff --git 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
index 58b6485..ebf8ae3 100644
--- 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
@@ -105,7 +105,6 @@ public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
public static void beforeClass() throws Exception {
assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155)", Constants.JRE_IS_MINIMUM_JAVA9);
initCore("dataimport-solrconfig.xml", "dataimport-schema-no-unique-key.xml", getFile("dihextras/solr").getAbsolutePath());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/785bebbc/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
index f4040a3..cd5d4af 100644
--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
@@ -282,11 +282,13 @@ public class ExtractingDocumentLoader extends ContentStreamLoader {
/**
* Lowercases the element name, but returns null for <BR>,
* which suppresses the start-element event for lt;BR> tags.
+ * This also suppresses the <BODY> tags because those
+ * are handled internally by Tika's XHTMLContentHandler.
*/
@Override
public String mapSafeElement(String name) {
String lowerName = name.toLowerCase(Locale.ROOT);
- return lowerName.equals("br") ? null : lowerName;
+ return (lowerName.equals("br") || lowerName.equals("body")) ? null : lowerName;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/785bebbc/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
----------------------------------------------------------------------
diff --git 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
index 23ca28a..8a91319 100644
--- 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
@@ -45,7 +45,6 @@ public class ExtractingRequestHandlerTest extends SolrTestCaseJ4 {
public static void beforeClass() throws Exception {
assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
- assumeFalse("This test fails with Java 9 (https://issues.apache.org/jira/browse/PDFBOX-3155)", Constants.JRE_IS_MINIMUM_JAVA9);
initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr").getAbsolutePath());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/785bebbc/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
----------------------------------------------------------------------
diff --git 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
index 2cdbd3c..be75f1b 100644
--- 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 @@ public class SolrCellMorphlineTest extends AbstractSolrMorphlineTestBase {
@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)",
- Constants.JRE_IS_MINIMUM_JAVA9);
}
@Before