You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/12/16 16:44:43 UTC
[tika] 01/01: Merge remote-tracking branch 'origin/main' into
TIKA-3180
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3180
in repository https://gitbox.apache.org/repos/asf/tika.git
commit fb569bfa7dbb566d983f377493099e12ada727bf
Merge: cdd0bf1 7f87695
Author: tallison <ta...@apache.org>
AuthorDate: Wed Dec 16 11:42:52 2020 -0500
Merge remote-tracking branch 'origin/main' into TIKA-3180
# Conflicts:
# tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
.../batch/fs/strawman/StrawManTikaAppDriver.java | 4 +---
tika-bundles/tika-bundle-classic/pom.xml | 14 +++++++++++--
tika-core/src/main/java/org/apache/tika/Tika.java | 17 +--------------
.../apache/tika/config/TikaConfigSerializer.java | 3 +--
.../main/java/org/apache/tika/fork/ForkClient.java | 6 ++----
.../java/org/apache/tika/utils/CharsetUtils.java | 2 +-
.../java/org/apache/tika/utils/CompareUtils.java | 2 +-
.../org/apache/tika/utils/ConcurrentUtils.java | 2 +-
.../main/java/org/apache/tika/utils/DateUtils.java | 2 +-
.../java/org/apache/tika/utils/ExceptionUtils.java | 2 +-
.../java/org/apache/tika/utils/ProcessUtils.java | 8 ++++----
.../org/apache/tika/utils/ServiceLoaderUtils.java | 2 +-
.../java/org/apache/tika/utils/SystemUtils.java | 4 ++--
.../java/org/apache/tika/utils/XMLReaderUtils.java | 8 ++++----
.../apache/tika/ResourceLoggingClassLoader.java | 2 +-
.../org/apache/tika/TestRereadableInputStream.java | 2 +-
.../tika/fork/UpperCasingContentHandler.java | 8 ++++----
.../fork/unusedpackage/ClassInUnusedPackage.java | 8 ++++----
.../org/apache/tika/parser/mock/MockParser.java | 2 +-
.../org/apache/tika/eval/app/reports/Report.java | 2 +-
.../eval/core/metadata/TikaEvalMetadataFilter.java | 2 +-
.../tika/eval/core/tokens/TokenStatistics.java | 2 +-
.../core/metadata/TikaEvalMetadataFilterTest.java | 2 +-
.../tika/example/SimpleTextExtractorTest.java | 2 +-
.../tika/example/SimpleTypeDetectorTest.java | 2 +-
.../tika/fuzzing/pdf/PDFTransformerConfig.java | 3 +--
tika-parent/pom.xml | 6 +++---
.../tika-age-recogniser/pom.xml | 13 ++++++------
.../org/apache/tika/dl/imagerec/DL4JVGG16Net.java | 8 ++++----
.../recognition/tf/TensorflowImageRecParser.java | 2 +-
.../tika/parser/journal/GrobidRESTParser.java | 8 ++++----
.../apache/tika/parser/journal/JournalParser.java | 2 +-
.../apache/tika/parser/journal/TEIDOMParser.java | 8 ++++----
.../tika/parser/journal/JournalParserTest.java | 8 ++++----
.../org/apache/tika/parser/journal/TEITest.java | 8 ++++----
.../tika/parser/ner/NamedEntityParserTest.java | 3 +--
.../parser/executable/ExecutableParserTest.java | 2 +-
.../apache/tika/parser/crypto/Pkcs7ParserTest.java | 2 +-
.../apache/tika/parser/html/HtmlParserTest.java | 6 ++----
.../tika-parser-image-module/pom.xml | 10 ++++++++-
.../apache/tika/parser/microsoft/EMFParser.java | 8 ++++----
.../parser/microsoft/TikaExcelDataFormatter.java | 8 ++++----
.../parser/microsoft/TikaExcelGeneralFormat.java | 8 ++++----
.../apache/tika/parser/microsoft/WMFParser.java | 8 ++++----
.../tika/parser/microsoft/chm/ChmCommons.java | 5 ++---
.../tika/parser/microsoft/EMFParserTest.java | 8 ++++----
.../tika/parser/microsoft/ExcelParserTest.java | 8 ++++----
.../parser/microsoft/PowerPointParserTest.java | 8 ++++----
.../tika/parser/microsoft/ProjectParserTest.java | 8 ++++----
.../tika/parser/microsoft/PublisherParserTest.java | 8 ++++----
.../tika/parser/microsoft/VisioParserTest.java | 8 ++++----
.../tika/parser/microsoft/WMFParserTest.java | 8 ++++----
.../tika/parser/microsoft/WordParserTest.java | 8 ++++----
.../org/apache/tika/parser/dif/DIFParserTest.java | 2 +-
.../apache/tika/parser/epub/EpubParserTest.java | 8 ++++----
.../tika/parser/ibooks/iBooksParserTest.java | 8 ++++----
.../org/apache/tika/parser/odf/ODFParserTest.java | 2 +-
.../apache/tika/parser/feed/FeedParserTest.java | 2 +-
.../apache/tika/parser/pdf/AbstractPDF2XHTML.java | 24 ++++++++++++----------
.../apache/tika/parser/pkg/CompressorParser.java | 6 ++----
.../org/apache/tika/parser/pkg/ArParserTest.java | 2 +-
.../tika/parser/txt/Icu4jEncodingDetector.java | 8 ++++----
.../apache/tika/parser/xml/DcXMLParserTest.java | 2 +-
.../EmptyAndDuplicateElementsXMLParserTest.java | 2 +-
.../org/apache/tika/parser/pkg/ArParserTest.java | 2 +-
.../org/apache/tika/parser/gdal/GDALParser.java | 2 +-
.../apache/tika/parser/gdal/TestGDALParser.java | 2 +-
.../tika/parser/isatab/ISArchiveParserTest.java | 2 +-
.../tika-parser-sqlite3-module/pom.xml | 4 ++--
.../tika/server/classic/DetectorResourceTest.java | 2 +-
.../org/apache/tika/server/core/ServerStatus.java | 4 +---
.../server/core/resource/DetectorResource.java | 2 +-
.../server/core/resource/LanguageResource.java | 2 +-
.../server/core/resource/TranslateResource.java | 2 +-
.../tika/server/core/LanguageResourceTest.java | 2 +-
.../apache/tika/server/core/StackTraceOffTest.java | 8 ++++----
.../apache/tika/server/core/StackTraceTest.java | 9 ++++----
.../tika/server/core/TranslateResourceTest.java | 2 +-
.../language/translate/ExternalTranslator.java | 2 +-
.../tika/language/translate/GoogleTranslator.java | 2 +-
.../tika/language/translate/Lingo24Translator.java | 2 +-
.../tika/language/translate/MosesTranslator.java | 2 +-
.../tika/language/translate/YandexTranslator.java | 2 +-
.../language/translate/GoogleTranslatorTest.java | 2 +-
.../translate/JoshuaNetworkTranslatorTest.java | 2 +-
.../language/translate/Lingo24TranslatorTest.java | 2 +-
.../language/translate/MosesTranslatorTest.java | 2 +-
.../language/translate/YandexTranslatorTest.java | 2 +-
88 files changed, 212 insertions(+), 219 deletions(-)
diff --cc tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
index 1613a47,5ba15ac..2c418f0
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
@@@ -1,6 -1,6 +1,6 @@@
-package org.apache.tika.server;
+package org.apache.tika.server.core;
- /**
+ /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --cc tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
index 89a665a,de17985..90c9a6d
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
@@@ -30,16 -30,16 +30,17 @@@ import org.apache.cxf.jaxrs.JAXRSServer
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.apache.tika.server.resource.DetectorResource;
-import org.apache.tika.server.resource.MetadataResource;
-import org.apache.tika.server.resource.RecursiveMetadataResource;
-import org.apache.tika.server.resource.TikaResource;
-import org.apache.tika.server.resource.UnpackerResource;
-import org.apache.tika.server.writer.CSVMessageBodyWriter;
-import org.apache.tika.server.writer.JSONMessageBodyWriter;
-import org.apache.tika.server.writer.MetadataListMessageBodyWriter;
-import org.apache.tika.server.writer.TextMessageBodyWriter;
-import org.apache.tika.server.writer.XMPMessageBodyWriter;
++import org.apache.tika.server.core.CXFTestBase;
++import org.apache.tika.server.core.TikaServerParseExceptionMapper;
+import org.apache.tika.server.core.resource.DetectorResource;
+import org.apache.tika.server.core.resource.MetadataResource;
+import org.apache.tika.server.core.resource.RecursiveMetadataResource;
+import org.apache.tika.server.core.resource.TikaResource;
+import org.apache.tika.server.core.resource.UnpackerResource;
+import org.apache.tika.server.core.writer.CSVMessageBodyWriter;
+import org.apache.tika.server.core.writer.JSONMessageBodyWriter;
+import org.apache.tika.server.core.writer.MetadataListMessageBodyWriter;
+import org.apache.tika.server.core.writer.TextMessageBodyWriter;
- //import org.apache.tika.server.core.writer.XMPMessageBodyWriter;
import org.junit.Assert;
import org.junit.Test;