[tika] branch branch_1x updated: TIKA-2692 -- general upgrades in prep for 1.19

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 8f61126  TIKA-2692 -- general upgrades in prep for 1.19
8f61126 is described below

commit 8f61126bebc4ac94f20b5a213b6208f3be4ca269
Author: TALLISON <ta...@apache.org>
AuthorDate: Thu Jul 26 16:28:49 2018 -0400

    TIKA-2692 -- general upgrades in prep for 1.19
    
    # Conflicts:
    #	tika-dl/pom.xml
    #	tika-parsers/pom.xml
---
 .../src/main/java/org/apache/tika/server/resource/TikaResource.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index 7ee07c3..b21a03c 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -27,6 +27,7 @@ import org.apache.tika.detect.Detector;
 import org.apache.tika.exception.EncryptedDocumentException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.metadata.TikaMetadataKeys;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.DigestingParser;
@@ -35,6 +36,7 @@ import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParserDecorator;
 import org.apache.tika.parser.PasswordProvider;
 import org.apache.tika.parser.html.BoilerpipeContentHandler;
+import org.apache.tika.parser.html.HtmlParser;
 import org.apache.tika.parser.ocr.TesseractOCRConfig;
 import org.apache.tika.parser.pdf.PDFParserConfig;
 import org.apache.tika.sax.BodyContentHandler;