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 2021/04/06 13:54:21 UTC

[tika] 01/02: Merge remote-tracking branch 'origin/main' into main

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

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

commit fed63cdcf644e07aa810a03cf6809ccba984c62f
Merge: e5a6039 6114fac
Author: tballison <ta...@apache.org>
AuthorDate: Mon Apr 5 09:58:53 2021 -0400

    Merge remote-tracking branch 'origin/main' into main
    
    # Conflicts:
    #	tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java

 .github/pull_request_template.md                   |   12 +
 .../workflows/main-build.yml                       |   33 +-
 .gitignore                                         |    1 +
 CHANGES.txt                                        |   25 +-
 pom.xml                                            |    2 +-
 tika-core/pom.xml                                  |   30 +
 tika-core/src/main/java/org/apache/tika/Tika.java  |  143 +-
 .../concurrent/ConfigurableThreadPoolExecutor.java |   64 +-
 .../tika/concurrent/SimpleThreadPoolExecutor.java  |   82 +-
 .../main/java/org/apache/tika/config/Field.java    |    4 +-
 .../java/org/apache/tika/config/Initializable.java |   11 +-
 .../tika/config/InitializableProblemHandler.java   |   19 +-
 .../org/apache/tika/config/LoadErrorHandler.java   |   29 +-
 .../main/java/org/apache/tika/config/Param.java    |  261 +-
 .../java/org/apache/tika/config/ParamField.java    |   56 +-
 .../java/org/apache/tika/config/ServiceLoader.java |  214 +-
 .../java/org/apache/tika/config/TikaActivator.java |    5 +-
 .../java/org/apache/tika/config/TikaConfig.java    |  703 +++---
 .../apache/tika/config/TikaConfigSerializer.java   |  119 +-
 .../org/apache/tika/detect/AutoDetectReader.java   |  100 +-
 .../org/apache/tika/detect/CompositeDetector.java  |   32 +-
 .../tika/detect/CompositeEncodingDetector.java     |   22 +-
 .../org/apache/tika/detect/DefaultDetector.java    |   83 +-
 .../tika/detect/DefaultEncodingDetector.java       |   13 +-
 .../apache/tika/detect/DefaultProbDetector.java    |   32 +-
 .../main/java/org/apache/tika/detect/Detector.java |    2 +-
 .../java/org/apache/tika/detect/EmptyDetector.java |    3 +-
 .../org/apache/tika/detect/EncodingDetector.java   |    2 +-
 .../apache/tika/detect/FileCommandDetector.java    |   58 +-
 .../java/org/apache/tika/detect/MagicDetector.java |  357 ++-
 .../apache/tika/detect/NNExampleModelDetector.java |   19 +-
 .../org/apache/tika/detect/NNTrainedModel.java     |  147 +-
 .../apache/tika/detect/NNTrainedModelBuilder.java  |   77 +-
 .../java/org/apache/tika/detect/NameDetector.java  |    6 +-
 .../tika/detect/NonDetectingEncodingDetector.java  |    8 +-
 .../org/apache/tika/detect/OverrideDetector.java   |   23 +-
 .../java/org/apache/tika/detect/TextDetector.java  |   15 +-
 .../org/apache/tika/detect/TextStatistics.java     |   27 +-
 .../java/org/apache/tika/detect/TrainedModel.java  |    7 +-
 .../apache/tika/detect/TrainedModelDetector.java   |   22 +-
 .../java/org/apache/tika/detect/TypeDetector.java  |    2 +-
 .../org/apache/tika/detect/XmlRootExtractor.java   |   16 +-
 .../apache/tika/detect/ZeroSizeFileDetector.java   |   13 +-
 .../java/org/apache/tika/embedder/Embedder.java    |   37 +-
 .../org/apache/tika/embedder/ExternalEmbedder.java |  243 +-
 .../tika/exception/EncryptedDocumentException.java |    2 +-
 .../apache/tika/exception/TikaConfigException.java |    1 +
 .../org/apache/tika/exception/TikaException.java   |    2 +-
 .../tika/exception/TikaMemoryLimitException.java   |    2 +-
 ...ikaException.java => TikaTimeoutException.java} |   14 +-
 .../apache/tika/exception/WriteLimitReached.java   |    9 +-
 .../tika/exception/ZeroByteFileException.java      |   15 +-
 .../apache/tika/extractor/ContainerExtractor.java  |   23 +-
 .../extractor/DefaultEmbeddedStreamTranslator.java |    8 +-
 .../apache/tika/extractor/DocumentSelector.java    |    2 +-
 .../tika/extractor/EmbeddedDocumentExtractor.java  |    7 +-
 .../tika/extractor/EmbeddedDocumentUtil.java       |   24 +-
 .../tika/extractor/EmbeddedStreamTranslator.java   |    4 +-
 .../tika/extractor/ParserContainerExtractor.java   |    8 +-
 .../ParsingEmbeddedDocumentExtractor.java          |   28 +-
 .../org/apache/tika/fork/ClassLoaderProxy.java     |   10 +-
 .../org/apache/tika/fork/ClassLoaderResource.java  |    7 +-
 .../org/apache/tika/fork/ContentHandlerProxy.java  |   54 +-
 .../apache/tika/fork/ContentHandlerResource.java   |   14 +-
 .../main/java/org/apache/tika/fork/ForkClient.java |  184 +-
 .../apache/tika/fork/ForkObjectInputStream.java    |   43 +-
 .../main/java/org/apache/tika/fork/ForkParser.java |  162 +-
 .../java/org/apache/tika/fork/ForkResource.java    |    4 +-
 .../main/java/org/apache/tika/fork/ForkServer.java |  126 +-
 .../org/apache/tika/fork/InputStreamProxy.java     |    4 +-
 .../org/apache/tika/fork/InputStreamResource.java  |    3 +-
 .../org/apache/tika/fork/MemoryURLConnection.java  |    2 +-
 .../apache/tika/fork/MemoryURLStreamHandler.java   |    4 +-
 .../tika/fork/MemoryURLStreamHandlerFactory.java   |    2 +-
 .../apache/tika/fork/MemoryURLStreamRecord.java    |    2 +-
 .../apache/tika/fork/MetadataContentHandler.java   |    6 +-
 .../org/apache/tika/fork/ParserFactoryFactory.java |   13 +-
 .../fork/RecursiveMetadataContentHandlerProxy.java |   39 +-
 .../RecursiveMetadataContentHandlerResource.java   |   40 +-
 .../org/apache/tika/io/BoundedInputStream.java     |    4 +-
 .../main/java/org/apache/tika/io/EndianUtils.java  |   42 +-
 .../java/org/apache/tika/io/FilenameUtils.java     |   30 +-
 .../src/main/java/org/apache/tika/io/IOUtils.java  |   18 +-
 .../org/apache/tika/io/InputStreamFactory.java     |   17 +-
 .../org/apache/tika/io/LookaheadInputStream.java   |   10 +-
 .../org/apache/tika/io/MappedBufferCleaner.java    |   96 +-
 .../main/java/org/apache/tika/io/TailStream.java   |  141 +-
 .../org/apache/tika/io/TemporaryResources.java     |    8 +-
 .../java/org/apache/tika/io/TikaInputStream.java   |  314 ++-
 .../apache/tika/language/LanguageIdentifier.java   |  165 +-
 .../org/apache/tika/language/LanguageProfile.java  |  106 +-
 .../tika/language/LanguageProfilerBuilder.java     |  496 ++--
 .../org/apache/tika/language/ProfilingHandler.java |    3 +-
 .../org/apache/tika/language/ProfilingWriter.java  |    2 +-
 .../tika/language/detect/LanguageConfidence.java   |    5 +-
 .../tika/language/detect/LanguageDetector.java     |  342 +--
 .../tika/language/detect/LanguageHandler.java      |   10 +-
 .../apache/tika/language/detect/LanguageNames.java |  111 +-
 .../tika/language/detect/LanguageResult.java       |  158 +-
 .../tika/language/detect/LanguageWriter.java       |   10 +-
 .../tika/language/translate/DefaultTranslator.java |   14 +-
 .../tika/language/translate/EmptyTranslator.java   |    2 +-
 .../apache/tika/language/translate/Translator.java |   22 +-
 .../apache/tika/metadata/AccessPermissions.java    |   24 +-
 .../org/apache/tika/metadata/ClimateForcast.java   |   30 +-
 .../org/apache/tika/metadata/CreativeCommons.java  |    2 +-
 .../java/org/apache/tika/metadata/Database.java    |   14 +-
 .../java/org/apache/tika/metadata/DublinCore.java  |   76 +-
 .../main/java/org/apache/tika/metadata/Font.java   |    4 +-
 .../java/org/apache/tika/metadata/Geographic.java  |   15 +-
 .../main/java/org/apache/tika/metadata/HTML.java   |    6 +-
 .../java/org/apache/tika/metadata/HttpHeaders.java |    4 +-
 .../main/java/org/apache/tika/metadata/IPTC.java   | 2527 ++++++++++----------
 .../org/apache/tika/metadata/MachineMetadata.java  |  143 +-
 .../java/org/apache/tika/metadata/Message.java     |   38 +-
 .../java/org/apache/tika/metadata/Metadata.java    |  241 +-
 .../main/java/org/apache/tika/metadata/Office.java |  211 +-
 .../apache/tika/metadata/OfficeOpenXMLCore.java    |   52 +-
 .../tika/metadata/OfficeOpenXMLExtended.java       |   65 +-
 .../main/java/org/apache/tika/metadata/PDF.java    |   76 +-
 .../java/org/apache/tika/metadata/PagedText.java   |    4 +-
 .../java/org/apache/tika/metadata/Photoshop.java   |   31 +-
 .../java/org/apache/tika/metadata/Property.java    |  265 +-
 .../tika/metadata/PropertyTypeException.java       |    8 +-
 .../java/org/apache/tika/metadata/QuattroPro.java  |   66 +-
 .../java/org/apache/tika/metadata/RTFMetadata.java |   45 +-
 .../main/java/org/apache/tika/metadata/TIFF.java   |  100 +-
 .../apache/tika/metadata/TikaCoreProperties.java   |  344 ++-
 .../java/org/apache/tika/metadata/WordPerfect.java |  100 +-
 .../main/java/org/apache/tika/metadata/XMP.java    |    4 +-
 .../main/java/org/apache/tika/metadata/XMPDM.java  |  290 +--
 .../main/java/org/apache/tika/metadata/XMPIdq.java |    4 +-
 .../main/java/org/apache/tika/metadata/XMPMM.java  |   42 +-
 .../java/org/apache/tika/metadata/XMPRights.java   |   20 +-
 .../metadata/filter/ClearByMimeMetadataFilter.java |   13 +-
 .../metadata/filter/CompositeMetadataFilter.java   |    4 +-
 .../metadata/filter/DefaultMetadataFilter.java     |   20 +-
 .../filter/ExcludeFieldMetadataFilter.java         |   10 +-
 .../metadata/filter/FieldNameMappingFilter.java    |   25 +-
 .../filter/IncludeFieldMetadataFilter.java         |   11 +-
 .../tika/metadata/filter/MetadataFilter.java       |    4 +-
 .../main/java/org/apache/tika/mime/HexCoDec.java   |   49 +-
 .../src/main/java/org/apache/tika/mime/Magic.java  |    2 -
 .../main/java/org/apache/tika/mime/MagicMatch.java |   12 +-
 .../main/java/org/apache/tika/mime/MediaType.java  |  273 +--
 .../org/apache/tika/mime/MediaTypeRegistry.java    |   67 +-
 .../main/java/org/apache/tika/mime/MimeType.java   |  283 ++-
 .../org/apache/tika/mime/MimeTypeException.java    |    6 +-
 .../main/java/org/apache/tika/mime/MimeTypes.java  |  247 +-
 .../org/apache/tika/mime/MimeTypesFactory.java     |  108 +-
 .../java/org/apache/tika/mime/MimeTypesReader.java |  346 +--
 .../apache/tika/mime/MimeTypesReaderMetKeys.java   |    2 +-
 .../org/apache/tika/mime/MinShouldMatchClause.java |   11 +-
 .../main/java/org/apache/tika/mime/Patterns.java   |   99 +-
 .../mime/ProbabilisticMimeDetectionSelector.java   |   93 +-
 .../parser/AbstractEncodingDetectorParser.java     |    1 +
 .../org/apache/tika/parser/AbstractParser.java     |   11 +-
 .../org/apache/tika/parser/AutoDetectParser.java   |   36 +-
 .../tika/parser/AutoDetectParserFactory.java       |    9 +-
 .../org/apache/tika/parser/CompositeParser.java    |   98 +-
 .../java/org/apache/tika/parser/CryptoParser.java  |   26 +-
 .../java/org/apache/tika/parser/DefaultParser.java |   88 +-
 .../org/apache/tika/parser/DelegatingParser.java   |   13 +-
 .../org/apache/tika/parser/DigestingParser.java    |   63 +-
 .../java/org/apache/tika/parser/EmptyParser.java   |   20 +-
 .../java/org/apache/tika/parser/ErrorParser.java   |   12 +-
 .../java/org/apache/tika/parser/NetworkParser.java |   66 +-
 .../java/org/apache/tika/parser/ParseContext.java  |   67 +-
 .../main/java/org/apache/tika/parser/Parser.java   |   23 +-
 .../org/apache/tika/parser/ParserDecorator.java    |   84 +-
 .../java/org/apache/tika/parser/ParserFactory.java |    7 +-
 .../apache/tika/parser/ParserPostProcessor.java    |   11 +-
 .../java/org/apache/tika/parser/ParsingReader.java |  130 +-
 .../org/apache/tika/parser/PasswordProvider.java   |   11 +-
 .../apache/tika/parser/RecursiveParserWrapper.java |  177 +-
 .../org/apache/tika/parser/StatefulParser.java     |    2 +-
 .../tika/parser/digest/CompositeDigester.java      |    2 +-
 .../tika/parser/digest/InputStreamDigester.java    |   64 +-
 .../parser/external/CompositeExternalParser.java   |   25 +-
 .../tika/parser/external/ExternalParser.java       |  293 ++-
 .../external/ExternalParsersConfigReader.java      |  335 ++-
 .../ExternalParsersConfigReaderMetKeys.java        |   14 +-
 .../parser/external/ExternalParsersFactory.java    |   93 +-
 .../parser/multiple/AbstractMultipleParser.java    |  376 +--
 .../tika/parser/multiple/FallbackParser.java       |   36 +-
 .../tika/parser/multiple/SupplementingParser.java  |   50 +-
 .../apache/tika/pipes/emitter/AbstractEmitter.java |   42 +-
 .../org/apache/tika/pipes/emitter/EmitData.java    |   25 +-
 .../org/apache/tika/pipes/emitter/EmitKey.java     |   28 +-
 .../org/apache/tika/pipes/emitter/Emitter.java     |    6 +-
 .../apache/tika/pipes/emitter/EmitterManager.java  |   16 +-
 .../apache/tika/pipes/emitter/EmptyEmitter.java    |    9 +-
 .../apache/tika/pipes/emitter/StreamEmitter.java   |    4 +-
 .../apache/tika/pipes/fetcher/EmptyFetcher.java    |    6 +-
 .../org/apache/tika/pipes/fetcher/FetchKey.java    |   33 +-
 .../org/apache/tika/pipes/fetcher/Fetcher.java     |   10 +-
 .../apache/tika/pipes/fetcher/FetcherManager.java  |   18 +-
 .../tika/pipes/fetcher/FileSystemFetcher.java      |   50 +-
 .../pipes/fetchiterator/EmptyFetchIterator.java    |    6 -
 .../tika/pipes/fetchiterator/FetchEmitTuple.java   |   43 +-
 .../tika/pipes/fetchiterator/FetchIterator.java    |  166 +-
 .../fetchiterator/FileSystemFetchIterator.java     |   45 +-
 .../sax/AbstractRecursiveParserWrapperHandler.java |   53 +-
 .../tika/sax/BasicContentHandlerFactory.java       |   98 +-
 .../org/apache/tika/sax/BodyContentHandler.java    |   12 +-
 .../java/org/apache/tika/sax/CleanPhoneText.java   |  345 +--
 .../apache/tika/sax/ContentHandlerDecorator.java   |   18 +-
 .../org/apache/tika/sax/ContentHandlerFactory.java |   15 +-
 .../org/apache/tika/sax/DIFContentHandler.java     |  242 +-
 .../tika/sax/ElementMappingContentHandler.java     |   81 +-
 .../sax/EndDocumentShieldingContentHandler.java    |   16 +-
 .../tika/sax/ExpandedTitleContentHandler.java      |   22 +-
 .../src/main/java/org/apache/tika/sax/Link.java    |    4 +-
 .../main/java/org/apache/tika/sax/LinkBuilder.java |   12 +-
 .../org/apache/tika/sax/LinkContentHandler.java    |   30 +-
 .../tika/sax/PhoneExtractingContentHandler.java    |   20 +-
 .../tika/sax/RecursiveParserWrapperHandler.java    |   54 +-
 .../apache/tika/sax/RichTextContentHandler.java    |    3 +-
 .../org/apache/tika/sax/SafeContentHandler.java    |  155 +-
 .../org/apache/tika/sax/SecureContentHandler.java  |   86 +-
 .../org/apache/tika/sax/StandardOrganizations.java |  305 +--
 .../org/apache/tika/sax/StandardReference.java     |  201 +-
 .../sax/StandardsExtractingContentHandler.java     |  155 +-
 .../java/org/apache/tika/sax/StandardsText.java    |  277 +--
 .../org/apache/tika/sax/TaggedContentHandler.java  |    8 +-
 .../org/apache/tika/sax/TaggedSAXException.java    |    6 +-
 .../org/apache/tika/sax/TeeContentHandler.java     |   18 +-
 .../tika/sax/TextAndAttributeContentHandler.java   |   12 +-
 .../org/apache/tika/sax/TextContentHandler.java    |   12 +-
 .../org/apache/tika/sax/ToHTMLContentHandler.java  |   10 +-
 .../org/apache/tika/sax/ToTextContentHandler.java  |   30 +-
 .../org/apache/tika/sax/ToXMLContentHandler.java   |  120 +-
 .../apache/tika/sax/WriteOutContentHandler.java    |   52 +-
 .../org/apache/tika/sax/XHTMLContentHandler.java   |  103 +-
 .../org/apache/tika/sax/XMPContentHandler.java     |   27 +-
 .../apache/tika/sax/xpath/CompositeMatcher.java    |    3 +-
 .../java/org/apache/tika/sax/xpath/Matcher.java    |    4 +-
 .../tika/sax/xpath/MatchingContentHandler.java     |   21 +-
 .../org/apache/tika/sax/xpath/XPathParser.java     |   10 +-
 .../org/apache/tika/utils/AnnotationUtils.java     |   61 +-
 .../java/org/apache/tika/utils/CharsetUtils.java   |   97 +-
 .../java/org/apache/tika/utils/CompareUtils.java   |   10 +-
 .../org/apache/tika/utils/ConcurrentUtils.java     |  112 +-
 .../main/java/org/apache/tika/utils/DateUtils.java |   90 +-
 .../java/org/apache/tika/utils/ExceptionUtils.java |    5 +-
 .../java/org/apache/tika/utils/ParserUtils.java    |   60 +-
 .../java/org/apache/tika/utils/ProcessUtils.java   |    2 +-
 .../java/org/apache/tika/utils/RegexUtils.java     |   20 +-
 .../apache/tika/utils/RereadableInputStream.java   |  261 +-
 .../org/apache/tika/utils/ServiceLoaderUtils.java  |   12 +-
 .../java/org/apache/tika/utils/StringUtils.java    |   26 +-
 .../java/org/apache/tika/utils/SystemUtils.java    |   15 +-
 .../java/org/apache/tika/utils/XMLReaderUtils.java |  545 +++--
 .../org/apache/tika/mime/tika-mimetypes.xml        |   11 +
 .../org/apache/custom/detect/MyCustomDetector.java |    6 +-
 .../org/apache/tika/MultiThreadedTikaTest.java     |  332 +--
 .../apache/tika/ResourceLoggingClassLoader.java    |   24 +-
 .../org/apache/tika/TestRereadableInputStream.java |  144 +-
 .../java/org/apache/tika/TikaDetectionTest.java    |   51 +-
 .../src/test/java/org/apache/tika/TikaIT.java      |    5 +-
 .../src/test/java/org/apache/tika/TikaTest.java    |  444 ++--
 .../org/apache/tika/TypeDetectionBenchmark.java    |   18 +-
 .../apache/tika/config/AbstractTikaConfigTest.java |   14 +-
 .../java/org/apache/tika/config/DummyExecutor.java |   59 +-
 .../java/org/apache/tika/config/DummyParser.java   |    8 +-
 .../java/org/apache/tika/config/ParamTest.java     |   37 +-
 .../tika/config/TikaConfigSerializerTest.java      |   24 +-
 .../org/apache/tika/config/TikaConfigTest.java     |  163 +-
 .../tika/detect/FileCommandDetectorTest.java       |   40 +-
 .../org/apache/tika/detect/MagicDetectorTest.java  |  143 +-
 .../tika/detect/MimeDetectionWithNNTest.java       |  213 +-
 .../org/apache/tika/detect/NameDetectorTest.java   |   25 +-
 .../org/apache/tika/detect/TextDetectorTest.java   |   31 +-
 .../org/apache/tika/detect/TypeDetectorTest.java   |   31 +-
 .../tika/detect/ZeroSizeFileDetectorTest.java      |    5 +-
 .../java/org/apache/tika/fork/ForkParserTest.java  |  123 +-
 .../apache/tika/fork/ForkParserTikaBinTest.java    |  135 +-
 .../java/org/apache/tika/fork/ForkTestParser.java  |   21 +-
 .../tika/fork/UpperCasingContentHandler.java       |    7 +-
 .../java/org/apache/tika/io/EndianUtilsTest.java   |   38 +-
 .../java/org/apache/tika/io/FilenameUtilsTest.java |   39 +-
 .../apache/tika/io/LookaheadInputStreamTest.java   |   20 +-
 .../java/org/apache/tika/io/TailStreamTest.java    |   87 +-
 .../org/apache/tika/io/TemporaryResourcesTest.java |    6 +-
 .../org/apache/tika/io/TikaInputStreamTest.java    |   56 +-
 .../tika/language/LanguageIdentifierTest.java      |   44 +-
 .../apache/tika/language/LanguageProfileTest.java  |    2 +-
 .../tika/language/LanguageProfilerBuilderTest.java |   32 +-
 .../tika/language/detect/LanguageNamesTest.java    |   26 +-
 .../org/apache/tika/metadata/TestMetadata.java     |  212 +-
 .../tika/metadata/filter/MockUpperCaseFilter.java  |    4 +-
 .../tika/metadata/filter/TestMetadataFilter.java   |   31 +-
 .../org/apache/tika/mime/CustomReaderTest.java     |  120 +-
 .../java/org/apache/tika/mime/MediaTypeTest.java   |   86 +-
 .../org/apache/tika/mime/MimeDetectionTest.java    |  135 +-
 .../org/apache/tika/mime/MimeTypesReaderTest.java  |  297 ++-
 .../java/org/apache/tika/mime/PatternsTest.java    |   18 +-
 .../tika/mime/ProbabilisticMimeDetectionTest.java  |  114 +-
 .../ProbabilisticMimeDetectionTestWithTika.java    |  100 +-
 .../apache/tika/parser/CompositeParserTest.java    |  158 +-
 .../tika/parser/DummyInitializableParser.java      |   29 +-
 .../tika/parser/DummyParameterizedParser.java      |   71 +-
 .../java/org/apache/tika/parser/DummyParser.java   |   57 +-
 .../tika/parser/InitializableParserTest.java       |   14 +-
 .../tika/parser/ParameterizedParserTest.java       |   35 +-
 .../apache/tika/parser/ParserDecoratorTest.java    |   57 +-
 .../org/apache/tika/parser/mock/MockParser.java    |   72 +-
 .../apache/tika/parser/mock/MockParserFactory.java |    8 +-
 .../org/apache/tika/parser/mock/VowelParser.java   |   11 +-
 .../tika/parser/multiple/MultipleParserTest.java   |  137 +-
 .../org/apache/tika/pipes/emitter/MockEmitter.java |    8 +-
 .../tika/pipes/fetcher/FileSystemFetcherTest.java  |   10 +-
 .../fetchiterator/FileSystemFetchIteratorTest.java |   51 +-
 .../tika/sax/BasicContentHandlerFactoryTest.java   |   98 +-
 .../apache/tika/sax/BodyContentHandlerTest.java    |    9 +-
 .../apache/tika/sax/LinkContentHandlerTest.java    |   29 +-
 .../apache/tika/sax/OfflineContentHandlerTest.java |    9 +-
 .../tika/sax/RichTextContentHandlerTest.java       |   15 +-
 .../apache/tika/sax/SecureContentHandlerTest.java  |    7 +-
 .../java/org/apache/tika/sax/SerializerTest.java   |   55 +-
 .../apache/tika/sax/XHTMLContentHandlerTest.java   |   77 +-
 .../org/apache/tika/utils/AnnotationUtilsTest.java |   47 +-
 .../org/apache/tika/utils/CharsetUtilsTest.java    |   14 +-
 .../org/apache/tika/utils/ConcurrentUtilsTest.java |  126 +-
 .../java/org/apache/tika/utils/RegexUtilsTest.java |   31 +-
 .../apache/tika/utils/ServiceLoaderUtilsTest.java  |   28 +-
 tika-core/src/test/resources/log4j.properties      |    1 +
 .../org/apache/tika/config/FileCommandDetector.xml |    2 +-
 .../org/apache/tika/config/TIKA-1762-executors.xml |   62 +-
 .../apache/tika/fuzzing/general/ByteFlipper.java   |    2 +-
 tika-parent/checkstyle.xml                         |  139 ++
 tika-parent/pom.xml                                |   42 +-
 tika-parsers/pom.xml                               |   38 +-
 .../tika/parser/recognition/AgeRecogniser.java     |  182 +-
 .../parser/recognition/AgeRecogniserConfig.java    |   59 +-
 .../tika/parser/recognition/AgeRecogniserTest.java |   53 +-
 .../tika/dl/imagerec/DL4JInceptionV3Net.java       |  138 +-
 .../org/apache/tika/dl/imagerec/DL4JVGG16Net.java  |   73 +-
 .../tika/dl/imagerec/DL4JInceptionV3NetTest.java   |   14 +-
 .../apache/tika/dl/imagerec/DL4JVGG16NetTest.java  |   15 +-
 .../tika/parser/captioning/CaptionObject.java      |    6 +-
 .../captioning/tf/TensorflowRESTCaptioner.java     |   44 +-
 .../tika/parser/pot/PooledTimeSeriesParser.java    |   85 +-
 .../tika/parser/recognition/ObjectRecogniser.java  |   36 +-
 .../recognition/ObjectRecognitionParser.java       |   50 +-
 .../tika/parser/recognition/RecognisedObject.java  |    7 +-
 .../recognition/tf/TensorflowImageRecParser.java   |   97 +-
 .../recognition/tf/TensorflowRESTRecogniser.java   |   54 +-
 .../tf/TensorflowRESTVideoRecogniser.java          |   30 +-
 .../tika/parser/captioning/tf/model_info.xml       |    3 +-
 .../recognition/tika-config-tflow-video-rest.xml   |    3 +-
 .../recognition/ObjectRecognitionParserTest.java   |   96 +-
 .../tf/TensorflowImageRecParserTest.java           |   28 +-
 .../tf/TensorflowVideoRecParserTest.java           |   30 +-
 .../parser/ctakes/CTAKESAnnotationProperty.java    |   16 +-
 .../apache/tika/parser/ctakes/CTAKESConfig.java    |  249 +-
 .../tika/parser/ctakes/CTAKESContentHandler.java   |  178 +-
 .../apache/tika/parser/ctakes/CTAKESParser.java    |   42 +-
 .../tika/parser/ctakes/CTAKESSerializer.java       |    5 +-
 .../org/apache/tika/parser/ctakes/CTAKESUtils.java |  423 ++--
 .../java/org/apache/tika/parser/geo/GeoParser.java |   85 +-
 .../apache/tika/parser/geo/GeoParserConfig.java    |   33 +-
 .../java/org/apache/tika/parser/geo/GeoTag.java    |   73 +-
 .../tika/parser/geo/NameEntityExtractor.java       |   23 +-
 .../parser/geo/gazetteer/GeoGazetteerClient.java   |  157 +-
 .../apache/tika/parser/geo/gazetteer/Location.java |  107 +-
 .../tika/parser/journal/GrobidRESTParser.java      |   62 +-
 .../apache/tika/parser/journal/JournalParser.java  |   44 +-
 .../apache/tika/parser/journal/TEIDOMParser.java   |  159 +-
 .../org/apache/tika/parser/ner/NERecogniser.java   |    8 +-
 .../apache/tika/parser/ner/NamedEntityParser.java  |   76 +-
 .../parser/ner/corenlp/CoreNLPNERecogniser.java    |   93 +-
 .../tika/parser/ner/grobid/GrobidNERecogniser.java |  208 +-
 .../tika/parser/ner/mitie/MITIENERecogniser.java   |  115 +-
 .../tika/parser/ner/nltk/NLTKNERecogniser.java     |   69 +-
 .../parser/ner/opennlp/OpenNLPNERecogniser.java    |   42 +-
 .../tika/parser/ner/opennlp/OpenNLPNameFinder.java |   37 +-
 .../tika/parser/ner/regex/RegexNERecogniser.java   |   31 +-
 .../parser/sentiment/SentimentAnalysisParser.java  |   33 +-
 .../tika/parser/ctakes/CTAKESConfig.properties     |    2 +-
 .../tika/parser/geo/GeoTopicConfig.properties      |    2 +-
 .../tika/parser/journal/GrobidExtractor.properties |    2 +-
 .../tika/parser/ner/grobid/GrobidServer.properties |    4 +-
 .../tika/parser/ner/nltk/NLTKServer.properties     |    2 +-
 .../org/apache/tika/parser/geo/GeoParserTest.java  |  147 +-
 .../tika/parser/journal/JournalParserTest.java     |    5 +-
 .../org/apache/tika/parser/journal/TEITest.java    |   32 +-
 .../tika/parser/ner/NamedEntityParserTest.java     |   29 +-
 .../tika/parser/ner/nltk/NLTKNERecogniserTest.java |   20 +-
 .../parser/ner/regex/RegexNERecogniserTest.java    |   18 +-
 .../sentiment/SentimentAnalysisParserTest.java     |   49 +-
 .../tika/config/TIKA-3078-geo.topic.GeoParser.xml  |   22 +-
 tika-parsers/tika-parsers-classic/pom.xml          |   89 +-
 .../apache/tika/detect/apple/BPListDetector.java   |   66 +-
 .../apache/tika/detect/apple/IWorkDetector.java    |   18 +-
 .../tika/parser/apple/AppleSingleFileParser.java   |   60 +-
 .../org/apache/tika/parser/apple/PListParser.java  |   92 +-
 .../tika/parser/iwork/AutoPageNumberUtils.java     |  146 +-
 .../tika/parser/iwork/IWorkPackageParser.java      |  271 ++-
 .../tika/parser/iwork/KeynoteContentHandler.java   |   36 +-
 .../tika/parser/iwork/NumbersContentHandler.java   |   16 +-
 .../tika/parser/iwork/PagesContentHandler.java     |  436 ++--
 .../parser/iwork/iwana/IWork13PackageParser.java   |  198 +-
 .../parser/iwork/iwana/IWork18PackageParser.java   |  180 +-
 .../apache/tika/parser/apple/PListParserTest.java  |   11 +-
 .../tika/parser/iwork/AutoPageNumberUtilsTest.java |   85 +-
 .../apache/tika/parser/iwork/IWorkParserTest.java  |  141 +-
 .../tika/parser/iwork/iwana/IWork13ParserTest.java |   23 +-
 .../org/apache/tika/parser/audio/AudioParser.java  |   32 +-
 .../org/apache/tika/parser/audio/MidiParser.java   |   41 +-
 .../org/apache/tika/parser/mp3/AudioFrame.java     |  241 +-
 .../java/org/apache/tika/parser/mp3/ID3Tags.java   |  294 +--
 .../org/apache/tika/parser/mp3/ID3v1Handler.java   |  103 +-
 .../org/apache/tika/parser/mp3/ID3v22Handler.java  |   71 +-
 .../org/apache/tika/parser/mp3/ID3v23Handler.java  |   31 +-
 .../org/apache/tika/parser/mp3/ID3v24Handler.java  |   35 +-
 .../org/apache/tika/parser/mp3/ID3v2Frame.java     |  418 ++--
 .../org/apache/tika/parser/mp3/LyricsHandler.java  |   82 +-
 .../java/org/apache/tika/parser/mp3/MP3Frame.java  |    2 +-
 .../java/org/apache/tika/parser/mp3/Mp3Parser.java |  213 +-
 .../org/apache/tika/parser/mp3/MpegStream.java     |  445 ++--
 .../apache/tika/parser/mp4/ISO6709Extractor.java   |   26 +-
 .../java/org/apache/tika/parser/mp4/MP4Parser.java |  172 +-
 .../org/apache/tika/parser/video/FLVParser.java    |   81 +-
 .../apache/tika/parser/audio/AudioParserTest.java  |   15 +-
 .../apache/tika/parser/audio/MidiParserTest.java   |    9 +-
 .../org/apache/tika/parser/mp3/Mp3ParserTest.java  |  151 +-
 .../org/apache/tika/parser/mp3/MpegStreamTest.java |   93 +-
 .../org/apache/tika/parser/mp4/MP4ParserTest.java  |   30 +-
 .../apache/tika/parser/video/FLVParserTest.java    |    7 +-
 .../java/org/apache/tika/parser/dwg/DWGParser.java |  336 ++-
 .../java/org/apache/tika/parser/prt/PRTParser.java |  413 ++--
 .../org/apache/tika/parser/dwg/DWGParserTest.java  |   99 +-
 .../org/apache/tika/parser/prt/PRTParserTest.java  |  135 +-
 .../org/apache/tika/parser/asm/ClassParser.java    |   17 +-
 .../apache/tika/parser/asm/XHTMLClassVisitor.java  |   45 +-
 .../apache/tika/parser/code/SourceCodeParser.java  |   36 +-
 .../tika/parser/executable/ExecutableParser.java   |  656 ++---
 .../java/org/apache/tika/parser/mat/MatParser.java |   44 +-
 .../org/apache/tika/parser/sas/SAS7BDATParser.java |   60 +-
 .../apache/tika/parser/asm/ClassParserTest.java    |   28 +-
 .../tika/parser/code/SourceCodeParserTest.java     |   56 +-
 .../parser/executable/ExecutableParserTest.java    |   32 +-
 .../org/apache/tika/parser/mat/MatParserTest.java  |    3 +-
 .../apache/tika/parser/sas/SAS7BDATParserTest.java |   37 +-
 .../org/apache/tika/parser/crypto/Pkcs7Parser.java |   41 +-
 .../org/apache/tika/parser/crypto/TSDParser.java   |  257 +-
 .../apache/tika/parser/crypto/Pkcs7ParserTest.java |    3 +-
 .../apache/tika/parser/crypto/TSDParserTest.java   |   16 +-
 .../parser/digestutils/BouncyCastleDigester.java   |   13 +-
 .../tika/parser/digestutils/CommonsDigester.java   |   69 +-
 .../tika/parser/font/AdobeFontMetricParser.java    |  167 +-
 .../apache/tika/parser/font/TrueTypeParser.java    |   27 +-
 .../apache/tika/parser/font/FontParsersTest.java   |   28 +-
 .../sax/boilerpipe/BoilerpipeContentHandler.java   |   46 +-
 .../org/apache/tika/parser/html/DataURIScheme.java |   13 +-
 .../parser/html/DataURISchemeParseException.java   |    4 +-
 .../apache/tika/parser/html/DataURISchemeUtil.java |   14 +-
 .../apache/tika/parser/html/DefaultHtmlMapper.java |  122 +-
 .../tika/parser/html/HtmlEncodingDetector.java     |   66 +-
 .../org/apache/tika/parser/html/HtmlHandler.java   |  104 +-
 .../org/apache/tika/parser/html/HtmlParser.java    |   83 +-
 .../tika/parser/html/XHTMLDowngradeHandler.java    |   20 +-
 .../html/charsetdetector/CharsetAliases.java       |   55 +-
 .../charsetdetector/CharsetDetectionResult.java    |   12 +-
 .../parser/html/charsetdetector/MetaProcessor.java |   18 +-
 .../parser/html/charsetdetector/PreScanner.java    |   83 +-
 .../StandardHtmlEncodingDetector.java              |   28 +-
 .../charsets/XUserDefinedCharset.java              |    8 +-
 .../tika/parser/html/DataURISchemeParserTest.java  |   19 +-
 .../tika/parser/html/HtmlEncodingDetectorTest.java |   60 +-
 .../apache/tika/parser/html/HtmlParserTest.java    |  705 +++---
 .../html/StandardHtmlEncodingDetectorTest.java     |  139 +-
 .../tika/parser/image/AbstractImageParser.java     |   55 +-
 .../org/apache/tika/parser/image/BPGParser.java    |   30 +-
 .../org/apache/tika/parser/image/HeifParser.java   |   33 +-
 .../org/apache/tika/parser/image/ICNSParser.java   |   55 +-
 .../org/apache/tika/parser/image/ICNSType.java     |  241 +-
 .../tika/parser/image/ImageMetadataExtractor.java  |  159 +-
 .../org/apache/tika/parser/image/ImageParser.java  |   63 +-
 .../org/apache/tika/parser/image/JpegParser.java   |   12 +-
 .../apache/tika/parser/image/MetadataFields.java   |    5 +-
 .../org/apache/tika/parser/image/PSDParser.java    |   43 +-
 .../org/apache/tika/parser/image/TiffParser.java   |   11 +-
 .../org/apache/tika/parser/image/WebPParser.java   |   11 +-
 .../apache/tika/parser/image/HeifParserTest.java   |   16 +-
 .../apache/tika/parser/image/ICNSParserTest.java   |   33 +-
 .../parser/image/ImageMetadataExtractorTest.java   |   17 +-
 .../apache/tika/parser/image/ImageParserTest.java  |  110 +-
 .../apache/tika/parser/image/JpegParserTest.java   |   76 +-
 .../apache/tika/parser/image/PSDParserTest.java    |   13 +-
 .../apache/tika/parser/image/WebPParserTest.java   |    3 +-
 .../apache/tika/parser/jdbc/AbstractDBParser.java  |   33 +-
 .../apache/tika/parser/jdbc/JDBCTableReader.java   |   79 +-
 .../apache/tika/parser/mailcommons/MailUtil.java   |    9 +-
 .../tika/parser/mailcommons/MailUtilTest.java      |   11 +-
 .../tika/parser/mail/MailContentHandler.java       |  209 +-
 .../org/apache/tika/parser/mail/RFC822Parser.java  |   30 +-
 .../org/apache/tika/parser/mbox/MboxParser.java    |   36 +-
 .../apache/tika/parser/mail/RFC822ParserTest.java  |  175 +-
 .../apache/tika/parser/mbox/MboxParserTest.java    |   25 +-
 .../tika-parser-microsoft-module/pom.xml           |   10 -
 .../detect/microsoft/POIFSContainerDetector.java   |   87 +-
 .../detect/microsoft/ooxml/OPCPackageDetector.java |  224 +-
 .../microsoft/MSEmbeddedStreamTranslator.java      |   24 +-
 .../tika/parser/microsoft/AbstractListManager.java |   23 +-
 .../parser/microsoft/AbstractOfficeParser.java     |   61 +-
 .../parser/microsoft/AbstractPOIFSExtractor.java   |   57 +-
 .../org/apache/tika/parser/microsoft/Cell.java     |    3 +-
 .../tika/parser/microsoft/CellDecorator.java       |    3 +-
 .../apache/tika/parser/microsoft/EMFParser.java    |   78 +-
 .../tika/parser/microsoft/ExcelExtractor.java      |  142 +-
 .../tika/parser/microsoft/FormattingUtils.java     |   23 +-
 .../tika/parser/microsoft/HSLFExtractor.java       |  124 +-
 .../tika/parser/microsoft/JackcessExtractor.java   |   81 +-
 .../tika/parser/microsoft/JackcessParser.java      |   33 +-
 .../apache/tika/parser/microsoft/LinkedCell.java   |    3 +-
 .../apache/tika/parser/microsoft/ListManager.java  |   33 +-
 .../tika/parser/microsoft/MSOwnerFileParser.java   |   37 +-
 .../apache/tika/parser/microsoft/NumberCell.java   |    3 +-
 .../apache/tika/parser/microsoft/OfficeParser.java |  146 +-
 .../tika/parser/microsoft/OfficeParserConfig.java  |   69 +-
 .../tika/parser/microsoft/OldExcelParser.java      |   23 +-
 .../tika/parser/microsoft/OutlookExtractor.java    |  363 ++-
 .../tika/parser/microsoft/SummaryExtractor.java    |   68 +-
 .../apache/tika/parser/microsoft/TNEFParser.java   |   44 +-
 .../org/apache/tika/parser/microsoft/TextCell.java |    3 +-
 .../parser/microsoft/TikaExcelDataFormatter.java   |   11 +-
 .../parser/microsoft/TikaExcelGeneralFormat.java   |    2 +-
 .../apache/tika/parser/microsoft/WMFParser.java    |   24 +-
 .../tika/parser/microsoft/WordExtractor.java       |   98 +-
 .../tika/parser/microsoft/chm/ChmAccessor.java     |   10 +-
 .../tika/parser/microsoft/chm/ChmAssert.java       |  139 +-
 .../tika/parser/microsoft/chm/ChmBlockInfo.java    |  103 +-
 .../tika/parser/microsoft/chm/ChmCommons.java      |  293 +--
 .../tika/parser/microsoft/chm/ChmConstants.java    |   54 +-
 .../microsoft/chm/ChmDirectoryListingSet.java      |  234 +-
 .../tika/parser/microsoft/chm/ChmExtractor.java    |  284 +--
 .../tika/parser/microsoft/chm/ChmItsfHeader.java   |  192 +-
 .../tika/parser/microsoft/chm/ChmItspHeader.java   |  271 +--
 .../tika/parser/microsoft/chm/ChmLzxBlock.java     |  455 ++--
 .../tika/parser/microsoft/chm/ChmLzxState.java     |  262 +-
 .../parser/microsoft/chm/ChmLzxcControlData.java   |  147 +-
 .../parser/microsoft/chm/ChmLzxcResetTable.java    |  129 +-
 .../tika/parser/microsoft/chm/ChmParser.java       |   39 +-
 .../tika/parser/microsoft/chm/ChmPmgiHeader.java   |   51 +-
 .../tika/parser/microsoft/chm/ChmPmglHeader.java   |   62 +-
 .../tika/parser/microsoft/chm/ChmSection.java      |   61 +-
 .../tika/parser/microsoft/chm/ChmWrapper.java      |   12 +-
 .../microsoft/chm/DirectoryListingEntry.java       |   41 +-
 .../tika/parser/microsoft/onenote/CompactID.java   |    9 +-
 .../tika/parser/microsoft/onenote/Error.java       |   11 +-
 .../parser/microsoft/onenote/ExtendedGUID.java     |   11 +-
 .../microsoft/onenote/FileChunkReference.java      |   20 +-
 .../tika/parser/microsoft/onenote/FileNode.java    |  102 +-
 .../microsoft/onenote/FileNodeListHeader.java      |   32 +-
 .../tika/parser/microsoft/onenote/FileNodePtr.java |    3 +-
 .../parser/microsoft/onenote/FileNodeUnion.java    |   33 +-
 .../microsoft/onenote/FndStructureConstants.java   |   44 +-
 .../apache/tika/parser/microsoft/onenote/GUID.java |   65 +-
 .../apache/tika/parser/microsoft/onenote/JCID.java |   38 +-
 .../microsoft/onenote/JCIDPropertySetTypeEnum.java |   76 +-
 .../onenote/ObjectDeclarationWithRefCount.java     |   27 +-
 .../onenote/ObjectDeclarationWithRefCountBody.java |    3 +-
 .../onenote/ObjectSpaceObjectPropSet.java          |   12 +-
 ...ctSpaceObjectStreamOfOIDsOSIDsOrContextIDs.java |    6 +-
 .../onenote/OneNoteDirectFileResource.java         |    9 +-
 .../parser/microsoft/onenote/OneNoteDocument.java  |   13 +-
 .../parser/microsoft/onenote/OneNoteHeader.java    |   18 +-
 .../onenote/OneNoteLegacyDumpStrings.java          |   47 +-
 .../parser/microsoft/onenote/OneNoteParser.java    |  149 +-
 .../microsoft/onenote/OneNotePropertyEnum.java     |  208 +-
 .../microsoft/onenote/OneNotePropertyId.java       |    7 +-
 .../tika/parser/microsoft/onenote/OneNotePtr.java  |  515 ++--
 .../microsoft/onenote/OneNoteTreeWalker.java       |  215 +-
 .../onenote/OneNoteTreeWalkerOptions.java          |   14 +-
 .../parser/microsoft/onenote/PropertyIDType.java   |    7 +-
 .../tika/parser/microsoft/onenote/PropertySet.java |   37 +-
 .../parser/microsoft/onenote/PropertyValue.java    |   20 +-
 .../tika/parser/microsoft/onenote/Revision.java    |   23 +-
 .../microsoft/onenote/RootObjectReference.java     |    3 +-
 .../microsoft/ooxml/AbstractOOXMLExtractor.java    |  168 +-
 .../parser/microsoft/ooxml/MetadataExtractor.java  |   79 +-
 .../parser/microsoft/ooxml/OOXMLExtractor.java     |   10 +-
 .../microsoft/ooxml/OOXMLExtractorFactory.java     |   97 +-
 .../tika/parser/microsoft/ooxml/OOXMLParser.java   |   60 +-
 .../microsoft/ooxml/OOXMLTikaBodyPartHandler.java  |   72 +-
 .../ooxml/OOXMLWordAndPowerPointTextHandler.java   |  110 +-
 .../ooxml/POIXMLTextExtractorDecorator.java        |    8 +-
 .../microsoft/ooxml/ParagraphProperties.java       |   18 +-
 .../tika/parser/microsoft/ooxml/RunProperties.java |    9 +-
 .../ooxml/SXSLFPowerPointExtractorDecorator.java   |  258 +-
 .../ooxml/SXWPFWordExtractorDecorator.java         |   93 +-
 .../ooxml/XSLFPowerPointExtractorDecorator.java    |   95 +-
 .../ooxml/XSSFBExcelExtractorDecorator.java        |   48 +-
 .../ooxml/XSSFExcelExtractorDecorator.java         |  181 +-
 .../parser/microsoft/ooxml/XWPFListManager.java    |   21 +-
 .../ooxml/XWPFWordExtractorDecorator.java          |  124 +-
 .../microsoft/ooxml/xps/XPSExtractorDecorator.java |  122 +-
 .../microsoft/ooxml/xps/XPSPageContentHandler.java |   98 +-
 .../microsoft/ooxml/xps/XPSTextExtractor.java      |    7 +-
 .../xslf/XSLFEventBasedPowerPointExtractor.java    |   16 +-
 .../ooxml/xwpf/XWPFEventBasedWordExtractor.java    |   63 +-
 .../microsoft/ooxml/xwpf/XWPFStylesShim.java       |   28 +-
 .../ooxml/xwpf/ml2006/AbstractPartHandler.java     |   11 +-
 .../ooxml/xwpf/ml2006/BinaryDataHandler.java       |   12 +-
 .../ooxml/xwpf/ml2006/CorePropertiesHandler.java   |   17 +-
 .../xwpf/ml2006/ExtendedPropertiesHandler.java     |    3 +-
 .../microsoft/ooxml/xwpf/ml2006/PartHandler.java   |    7 +-
 .../ooxml/xwpf/ml2006/RelationshipsHandler.java    |    5 +-
 .../ooxml/xwpf/ml2006/RelationshipsManager.java    |    3 +-
 .../ooxml/xwpf/ml2006/Word2006MLDocHandler.java    |   40 +-
 .../ooxml/xwpf/ml2006/Word2006MLParser.java        |   21 +-
 .../ml2006/WordAndPowerPointTextPartHandler.java   |   17 +-
 .../parser/microsoft/pst/OutlookPSTParser.java     |   64 +-
 .../parser/microsoft/rtf/RTFEmbObjHandler.java     |   40 +-
 .../parser/microsoft/rtf/RTFObjDataParser.java     |   62 +-
 .../tika/parser/microsoft/rtf/RTFParser.java       |   53 +-
 .../tika/parser/microsoft/rtf/TextExtractor.java   |   93 +-
 .../microsoft/xml/AbstractXML2003Parser.java       |   41 +-
 .../parser/microsoft/xml/HyperlinkHandler.java     |   23 +-
 .../parser/microsoft/xml/SpreadsheetMLParser.java  |   50 +-
 .../tika/parser/microsoft/xml/WordMLParser.java    |   75 +-
 .../AbstractPOIContainerExtractionTest.java        |   16 +-
 .../tika/parser/microsoft/EMFParserTest.java       |   13 +-
 .../tika/parser/microsoft/ExcelParserTest.java     |   69 +-
 .../tika/parser/microsoft/JackcessParserTest.java  |   40 +-
 .../parser/microsoft/MSOwnerFileParserTest.java    |    7 +-
 .../tika/parser/microsoft/OfficeParserTest.java    |    4 +-
 .../tika/parser/microsoft/OldExcelParserTest.java  |   13 +-
 .../tika/parser/microsoft/OutlookParserTest.java   |   84 +-
 .../microsoft/POIContainerExtractionTest.java      |   19 +-
 .../parser/microsoft/PowerPointParserTest.java     |   47 +-
 .../tika/parser/microsoft/ProjectParserTest.java   |   27 +-
 .../tika/parser/microsoft/PublisherParserTest.java |   13 +-
 .../parser/microsoft/SolidworksParserTest.java     |   46 +-
 .../tika/parser/microsoft/TNEFParserTest.java      |    9 +-
 .../tika/parser/microsoft/VisioParserTest.java     |   13 +-
 .../tika/parser/microsoft/WMFParserTest.java       |    9 +-
 .../tika/parser/microsoft/WordParserTest.java      |  123 +-
 .../parser/microsoft/WriteProtectedParserTest.java |    9 +-
 .../parser/microsoft/chm/TestChmBlockInfo.java     |   50 +-
 .../parser/microsoft/chm/TestChmExtraction.java    |  161 +-
 .../parser/microsoft/chm/TestChmExtractor.java     |   16 +-
 .../parser/microsoft/chm/TestChmItsfHeader.java    |   40 +-
 .../parser/microsoft/chm/TestChmItspHeader.java    |   60 +-
 .../tika/parser/microsoft/chm/TestChmLzxState.java |   37 +-
 .../microsoft/chm/TestChmLzxcControlData.java      |   54 +-
 .../microsoft/chm/TestChmLzxcResetTable.java       |   59 +-
 .../microsoft/chm/TestDirectoryListingEntry.java   |    9 +-
 .../tika/parser/microsoft/chm/TestParameters.java  |   34 +-
 .../tika/parser/microsoft/chm/TestPmglHeader.java  |   24 +-
 .../microsoft/onenote/OneNoteParserTest.java       |   83 +-
 .../ooxml/OOXMLContainerExtractionTest.java        |   24 +-
 .../parser/microsoft/ooxml/OOXMLParserTest.java    |  274 +--
 .../parser/microsoft/ooxml/SXSLFExtractorTest.java |  122 +-
 .../parser/microsoft/ooxml/SXWPFExtractorTest.java |   97 +-
 .../parser/microsoft/ooxml/TruncatedOOXMLTest.java |   41 +-
 .../parser/microsoft/ooxml/xps/XPSParserTest.java  |   68 +-
 .../ooxml/xwpf/ml2006/Word2006MLParserTest.java    |   29 +-
 .../parser/microsoft/pst/OutlookPSTParserTest.java |   84 +-
 .../tika/parser/microsoft/rtf/RTFParserTest.java   |   91 +-
 .../parser/microsoft/xml/XML2003ParserTest.java    |   35 +-
 .../test-documents/testXPSWithDataDescriptor.xps   |  Bin 0 -> 44523 bytes
 .../test-documents/testXPSWithDataDescriptor2.xps  |  Bin 0 -> 51175 bytes
 .../apache/tika/detect/ole/MiscOLEDetector.java    |   69 +-
 .../java/org/apache/tika/parser/dbf/DBFCell.java   |   30 +-
 .../apache/tika/parser/dbf/DBFColumnHeader.java    |   68 +-
 .../org/apache/tika/parser/dbf/DBFFileHeader.java  |   46 +-
 .../java/org/apache/tika/parser/dbf/DBFParser.java |   34 +-
 .../java/org/apache/tika/parser/dbf/DBFReader.java |  167 +-
 .../java/org/apache/tika/parser/dbf/DBFRow.java    |   16 +-
 .../apache/tika/parser/dif/DIFContentHandler.java  |  241 +-
 .../java/org/apache/tika/parser/dif/DIFParser.java |   85 +-
 .../apache/tika/parser/epub/EpubContentParser.java |   29 +-
 .../org/apache/tika/parser/epub/EpubParser.java    |  124 +-
 .../apache/tika/parser/hwp/HwpStreamReader.java    |    2 +-
 .../apache/tika/parser/hwp/HwpTextExtractorV5.java |  111 +-
 .../org/apache/tika/parser/hwp/HwpV5Parser.java    |   16 +-
 .../apache/tika/parser/mif/MIFContentHandler.java  |   17 +-
 .../org/apache/tika/parser/mif/MIFExtractor.java   |   34 +-
 .../java/org/apache/tika/parser/mif/MIFParser.java |   42 +-
 .../parser/odf/FlatOpenDocumentMacroHandler.java   |   43 +-
 .../tika/parser/odf/FlatOpenDocumentParser.java    |  101 +-
 .../parser/odf/NSNormalizerContentHandler.java     |   29 +-
 .../tika/parser/odf/OpenDocumentBodyHandler.java   |  311 +--
 .../tika/parser/odf/OpenDocumentContentParser.java |   40 +-
 .../tika/parser/odf/OpenDocumentMacroHandler.java  |   16 +-
 .../parser/odf/OpenDocumentManifestHandler.java    |   35 +-
 .../tika/parser/odf/OpenDocumentMetaParser.java    |  101 +-
 .../apache/tika/parser/odf/OpenDocumentParser.java |  156 +-
 .../tika/parser/wordperfect/QPWTextExtractor.java  |  251 +-
 .../tika/parser/wordperfect/QuattroProParser.java  |   34 +-
 .../tika/parser/wordperfect/WP5Charsets.java       |  289 ++-
 .../wordperfect/WP5DocumentAreaExtractor.java      |   66 +-
 .../tika/parser/wordperfect/WP6Charsets.java       |  750 +++---
 .../wordperfect/WP6DocumentAreaExtractor.java      |   58 +-
 .../wordperfect/WPDocumentAreaExtractor.java       |   23 +-
 .../tika/parser/wordperfect/WPInputStream.java     |   25 +-
 .../tika/parser/wordperfect/WPPrefixArea.java      |   37 +-
 .../parser/wordperfect/WPPrefixAreaExtractor.java  |   10 +-
 .../tika/parser/wordperfect/WordPerfectParser.java |   78 +-
 .../org/apache/tika/parser/dbf/DBFParserTest.java  |   36 +-
 .../org/apache/tika/parser/dif/DIFParserTest.java  |   25 +-
 .../apache/tika/parser/epub/EpubParserTest.java    |   30 +-
 .../apache/tika/parser/hwp/HwpV5ParserTest.java    |   17 +-
 .../tika/parser/ibooks/iBooksParserTest.java       |   18 +-
 .../org/apache/tika/parser/mif/MIFParserTest.java  |    9 +-
 .../org/apache/tika/parser/odf/ODFParserTest.java  |  265 +-
 .../tika/parser/wordperfect/QuattroProTest.java    |   12 +-
 .../tika/parser/wordperfect/WPInputStreamTest.java |   14 +-
 .../tika/parser/wordperfect/WordPerfectTest.java   |   20 +-
 .../resources/test-documents/testODTEncrypted.odt  |  Bin 0 -> 12714 bytes
 .../org/apache/tika/parser/feed/FeedParser.java    |   76 +-
 .../apache/tika/parser/iptc/IptcAnpaParser.java    | 1404 +++++------
 .../apache/tika/parser/feed/FeedParserTest.java    |   23 +-
 .../apache/tika/parser/ocr/ImagePreprocessor.java  |   67 +-
 .../apache/tika/parser/ocr/TesseractOCRConfig.java |  197 +-
 .../apache/tika/parser/ocr/TesseractOCRParser.java |  366 ++-
 .../apache/tika/parser/ocr/tess4j/ImageDeskew.java |   10 +-
 .../apache/tika/parser/ocr/tess4j/ImageUtil.java   |   17 +-
 .../tika/parser/ocr/TesseractOCRConfigTest.java    |  149 +-
 .../tika/parser/ocr/TesseractOCRParserTest.java    |  103 +-
 .../resources/test-configs/TIKA-2705-tesseract.xml |   26 +-
 .../tika-config-tesseract-arbitrary.xml            |   22 +-
 .../test-configs/tika-config-tesseract-full.xml    |   38 +-
 .../tika-config-tesseract-load-langs.xml           |   20 +-
 .../test-configs/tika-config-tesseract-partial.xml |   32 +-
 .../tika-parser-pdf-module/pom.xml                 |   10 -
 .../apache/tika/parser/pdf/AbstractPDF2XHTML.java  |  491 ++--
 .../org/apache/tika/parser/pdf/AccessChecker.java  |   18 +-
 .../tika/parser/pdf/ImageGraphicsEngine.java       |  290 ++-
 .../java/org/apache/tika/parser/pdf/OCR2XHTML.java |   20 +-
 .../java/org/apache/tika/parser/pdf/PDF2XHTML.java |   97 +-
 .../tika/parser/pdf/PDFEncodedStringDecoder.java   |    6 +-
 .../tika/parser/pdf/PDFMarkedContent2XHTML.java    |  207 +-
 .../java/org/apache/tika/parser/pdf/PDFParser.java |  133 +-
 .../apache/tika/parser/pdf/PDFParserConfig.java    |  360 +--
 .../apache/tika/parser/pdf/PDFPreflightParser.java |   82 +-
 .../tika/parser/pdf/PDMetadataExtractor.java       |   54 +-
 .../org/apache/tika/parser/pdf/XFAExtractor.java   |   75 +-
 .../apache/tika/parser/pdf/AccessCheckerTest.java  |    6 +-
 .../parser/pdf/PDFMarkedContent2XHTMLTest.java     |   21 +-
 .../org/apache/tika/parser/pdf/PDFParserTest.java  |  324 +--
 .../tika/parser/pdf/PDFPreflightParserTest.java    |   18 +-
 .../testPDF_deeplyEmbeddedAttachments.pdf          |  Bin 0 -> 122221 bytes
 .../apache/tika/parser/pkg/CompressorParser.java   |   54 +-
 .../org/apache/tika/parser/pkg/PackageParser.java  |  223 +-
 .../java/org/apache/tika/parser/pkg/RarParser.java |   30 +-
 .../apache/tika/parser/pkg/AbstractPkgTest.java    |   94 +-
 .../org/apache/tika/parser/pkg/ArParserTest.java   |   11 +-
 .../apache/tika/parser/pkg/Bzip2ParserTest.java    |   37 +-
 .../apache/tika/parser/pkg/CompressParserTest.java |   39 +-
 .../tika/parser/pkg/CompressorParserTest.java      |   21 +-
 .../org/apache/tika/parser/pkg/GzipParserTest.java |   29 +-
 .../apache/tika/parser/pkg/PackageParserTest.java  |   19 +-
 .../org/apache/tika/parser/pkg/RarParserTest.java  |   99 +-
 .../apache/tika/parser/pkg/Seven7ParserTest.java   |   69 +-
 .../org/apache/tika/parser/pkg/TarParserTest.java  |   67 +-
 .../org/apache/tika/parser/pkg/ZipParserTest.java  |   98 +-
 .../org/apache/tika/parser/pkg/ZlibParserTest.java |   33 +-
 .../src/test/resources/test-documents/testSVG.svg  |    8 +-
 .../java/org/apache/tika/parser/csv/CSVParams.java |    4 +-
 .../java/org/apache/tika/parser/csv/CSVResult.java |   17 +-
 .../org/apache/tika/parser/csv/CSVSniffer.java     |   84 +-
 .../apache/tika/parser/csv/TextAndCSVParser.java   |  173 +-
 .../tika/parser/strings/Latin1StringsParser.java   |  145 +-
 .../apache/tika/parser/strings/StringsConfig.java  |  163 +-
 .../tika/parser/strings/StringsEncoding.java       |   62 +-
 .../apache/tika/parser/strings/StringsParser.java  |  495 ++--
 .../apache/tika/parser/txt/CharsetDetector.java    |   46 +-
 .../org/apache/tika/parser/txt/CharsetMatch.java   |   10 +-
 .../apache/tika/parser/txt/CharsetRecog_2022.java  |   20 +-
 .../apache/tika/parser/txt/CharsetRecog_UTF8.java  |    8 +-
 .../tika/parser/txt/CharsetRecog_Unicode.java      |    2 +-
 .../apache/tika/parser/txt/CharsetRecog_mbcs.java  |  113 +-
 .../apache/tika/parser/txt/CharsetRecog_sbcs.java  | 1801 ++++++++------
 .../apache/tika/parser/txt/CharsetRecognizer.java  |    2 +-
 .../tika/parser/txt/Icu4jEncodingDetector.java     |   17 +-
 .../java/org/apache/tika/parser/txt/TXTParser.java |   26 +-
 .../tika/parser/txt/UniversalEncodingDetector.java |   16 +-
 .../tika/parser/txt/UniversalEncodingListener.java |   21 +-
 .../org/apache/tika/parser/csv/CSVSnifferTest.java |   51 +-
 .../tika/parser/csv/TextAndCSVParserTest.java      |  115 +-
 .../parser/strings/Latin1StringsParserTest.java    |   28 +-
 .../tika/parser/strings/StringsConfigTest.java     |  111 +-
 .../tika/parser/strings/StringsParserTest.java     |   89 +-
 .../tika/parser/txt/CharsetDetectorTest.java       |   21 +-
 .../org/apache/tika/parser/txt/TXTParserTest.java  |  126 +-
 .../test-configs/tika-config-strings-full.xml      |   18 +-
 .../test-configs/tika-config-strings-partial.xml   |   16 +-
 .../src/test/resources/test-documents/resume.html  |  140 +-
 .../tika/parser/xliff/XLIFF12ContentHandler.java   |   15 +-
 .../apache/tika/parser/xliff/XLIFF12Parser.java    |   27 +-
 .../org/apache/tika/parser/xliff/XLZParser.java    |   43 +-
 .../tika/parser/xml/AbstractMetadataHandler.java   |   46 +-
 .../xml/AttributeDependantMetadataHandler.java     |   34 +-
 .../tika/parser/xml/AttributeMetadataHandler.java  |   28 +-
 .../org/apache/tika/parser/xml/DcXMLParser.java    |   22 +-
 .../tika/parser/xml/ElementMetadataHandler.java    |   69 +-
 .../apache/tika/parser/xml/FictionBookParser.java  |   33 +-
 .../apache/tika/parser/xml/MetadataHandler.java    |   33 +-
 .../tika/parser/xml/TextAndAttributeXMLParser.java |    6 +-
 .../java/org/apache/tika/parser/xml/XMLParser.java |   39 +-
 .../org/apache/tika/parser/xml/XMLProfiler.java    |   99 +-
 .../tika/parser/xliff/XLIFF12ParserTest.java       |    5 +-
 .../apache/tika/parser/xliff/XLZParserTest.java    |   18 +-
 .../apache/tika/parser/xml/DcXMLParserTest.java    |   27 +-
 .../EmptyAndDuplicateElementsXMLParserTest.java    |   56 +-
 .../tika/parser/xml/FictionBookParserTest.java     |   10 +-
 .../parser/xml/TextAndAttributeXMLParserTest.java  |   21 +-
 .../src/test/resources/test-documents/testXML.xml  |   30 +-
 .../src/test/resources/test-documents/testXML2.xml |   10 +-
 .../src/test/resources/test-documents/testXML3.xml |   38 +-
 .../apache/tika/parser/xmp/JempboxExtractor.java   |   91 +-
 .../apache/tika/parser/xmp/XMPPacketScanner.java   |    4 +-
 .../tika/parser/xmp/JempboxExtractorTest.java      |   31 +-
 .../src/test/resources/test-documents/testXMP.xmp  |  342 ++-
 .../tika/detect/zip/CompressorConstants.java       |    3 +-
 .../detect/zip/DefaultZipContainerDetector.java    |  165 +-
 .../DeprecatedStreamingZipContainerDetector.java   |   37 +-
 .../detect/zip/DeprecatedZipContainerDetector.java |    3 -
 .../org/apache/tika/detect/zip/IPADetector.java    |   21 +-
 .../org/apache/tika/detect/zip/JarDetector.java    |   14 +-
 .../org/apache/tika/detect/zip/KMZDetector.java    |   22 +-
 .../tika/detect/zip/OpenDocumentDetector.java      |   20 +-
 .../apache/tika/detect/zip/PackageConstants.java   |    1 +
 .../apache/tika/detect/zip/StarOfficeDetector.java |   78 +-
 .../tika/detect/zip/StreamingDetectContext.java    |   16 +-
 .../detect/zip/StreamingZipContainerDetector.java  |   13 +-
 .../tika/detect/zip/ZipContainerDetector.java      |   16 +-
 .../tika/detect/zip/ZipContainerDetectorBase.java  |   47 +-
 .../org/apache/tika/zip/utils/ZipSalvager.java     |  104 +-
 .../org/apache/tika/detect/zip/ZipParserTest.java  |   14 +-
 .../org/apache/tika/parser/internal/Activator.java |   22 +-
 .../apache/tika/config/TikaDetectorConfigTest.java |   87 +-
 .../tika/config/TikaEncodingDetectorTest.java      |   82 +-
 .../apache/tika/config/TikaParserConfigTest.java   |   69 +-
 .../tika/config/TikaTranslatorConfigTest.java      |   21 +-
 .../tika/detect/TestContainerAwareDetector.java    |  278 ++-
 .../apache/tika/detect/TestDetectorLoading.java    |   15 +-
 .../tika/detect/TestFileCommandDetector.java       |   12 +-
 .../tika/extractor/EmbeddedDocumentUtilTest.java   |    3 +-
 .../java/org/apache/tika/mime/MimeTypeTest.java    |   12 +-
 .../java/org/apache/tika/mime/MimeTypesTest.java   |    4 +-
 .../java/org/apache/tika/mime/TestMimeTypes.java   |  733 +++---
 .../apache/tika/parser/AutoDetectParserTest.java   |  357 ++-
 .../tika/parser/AutoDetectReaderParserTest.java    |   24 +-
 .../parser/BouncyCastleDigestingParserTest.java    |  125 +-
 .../apache/tika/parser/DigestingParserTest.java    |  120 +-
 .../org/apache/tika/parser/ParsingReaderTest.java  |   13 +-
 .../tika/parser/RecursiveParserWrapperTest.java    |   61 +-
 .../org/apache/tika/parser/TabularFormatsTest.java |  252 +-
 .../java/org/apache/tika/parser/TestParsers.java   |   49 +-
 .../apache/tika/parser/TestXMLEntityExpansion.java |   90 +-
 .../java/org/apache/tika/parser/TestXXEInXML.java  |  115 +-
 .../java/org/apache/tika/parser/XMLTestBase.java   |   80 +-
 .../parser/apple/AppleSingleFileParserTest.java    |    8 +-
 .../apache/tika/parser/apple/PListParserTest.java  |   11 +-
 .../apache/tika/parser/crypto/TSDParserTest.java   |   19 +-
 .../parser/fork/ForkParserIntegrationTest.java     |  285 +--
 .../apache/tika/parser/html/HtmlParserTest.java    |   20 +-
 .../apache/tika/parser/mail/MboxParserTest.java    |   16 +-
 .../apache/tika/parser/mail/RFC822ParserTest.java  |   42 +-
 .../tika/parser/microsoft/EMFParserTest.java       |   17 +-
 .../tika/parser/microsoft/ExcelParserTest.java     |    7 +-
 .../microsoft/POIContainerExtractionTest.java      |    9 +-
 .../parser/microsoft/PowerPointParserTest.java     |   14 +-
 .../tika/parser/microsoft/XML2003ParserTest.java   |   25 +-
 .../parser/microsoft/ooxml/OOXMLParserTest.java    |   12 +-
 .../parser/microsoft/ooxml/TruncatedOOXMLTest.java |   17 +-
 .../tika/parser/microsoft/rtf/RTFParserTest.java   |   65 +-
 .../apache/tika/parser/mock/MockParserTest.java    |   70 +-
 .../tika/parser/ocr/TesseractOCRParserTest.java    |   62 +-
 .../org/apache/tika/parser/odf/ODFParserTest.java  |   54 +-
 .../org/apache/tika/parser/pdf/PDFParserTest.java  |  100 +-
 .../org/apache/tika/parser/pkg/ArParserTest.java   |   17 +-
 .../apache/tika/parser/pkg/Bzip2ParserTest.java    |   11 +-
 .../pkg/CompositeZipContainerDetectorTest.java     |  141 +-
 .../apache/tika/parser/pkg/CompressParserTest.java |   25 +-
 .../tika/parser/pkg/CompressorParserTest.java      |   17 +-
 .../org/apache/tika/parser/pkg/GzipParserTest.java |   13 +-
 .../org/apache/tika/parser/pkg/RarParserTest.java  |   16 +-
 .../apache/tika/parser/pkg/Seven7ParserTest.java   |   64 +-
 .../org/apache/tika/parser/pkg/TarParserTest.java  |   11 +-
 .../org/apache/tika/parser/pkg/ZipParserTest.java  |   65 +-
 .../org/apache/tika/parser/pkg/ZlibParserTest.java |   11 +-
 .../tika/parser/xml/FictionBookParserTest.java     |   14 +-
 .../sax/PhoneExtractingContentHandlerTest.java     |   20 +-
 .../sax/StandardsExtractingContentHandlerTest.java |   47 +-
 .../apache/tika/utils/ServiceLoaderUtilsTest.java  |    6 +-
 .../src/test/resources/log4j.properties            |    1 +
 .../test-documents/testJAVAPROPS.properties        |    1 +
 .../apache/tika/parser/envi/EnviHeaderParser.java  |  112 +-
 .../org/apache/tika/parser/gdal/GDALParser.java    |  249 +-
 .../geoinfo/GeographicInformationParser.java       |  451 ++--
 .../org/apache/tika/parser/grib/GribParser.java    |   41 +-
 .../java/org/apache/tika/parser/hdf/HDFParser.java |   32 +-
 .../org/apache/tika/parser/isatab/ISATabUtils.java |  311 +--
 .../apache/tika/parser/isatab/ISArchiveParser.java |  222 +-
 .../apache/tika/parser/netcdf/NetCDFParser.java    |   28 +-
 .../tika/parser/envi/EnviHeaderParserTest.java     |   59 +-
 .../apache/tika/parser/gdal/TestGDALParser.java    |  112 +-
 .../geoinfo/GeographicInformationParserTest.java   |    5 +-
 .../apache/tika/parser/grib/GribParserTest.java    |   17 +-
 .../org/apache/tika/parser/hdf/HDFParserTest.java  |   48 +-
 .../tika/parser/isatab/ISArchiveParserTest.java    |   68 +-
 .../tika/parser/netcdf/NetCDFParserTest.java       |   23 +-
 .../ground-truth/EnviHeaderGroundTruth.txt         |    1 +
 .../tika/parser/sqlite3/SQLite3DBParser.java       |   19 +-
 .../apache/tika/parser/sqlite3/SQLite3Parser.java  |   17 +-
 .../tika/parser/sqlite3/SQLite3TableReader.java    |   19 +-
 .../tika/parser/sqlite3/SQLite3ParserTest.java     |   37 +-
 .../apache/tika/mime/TestMimeTypesExtended.java    |   23 +-
 .../tika/parser/sqlite3/SQLite3ParserTest.java     |   68 +-
 tika-pipes/pom.xml                                 |   38 +-
 tika-pipes/tika-emitters/tika-emitter-fs/pom.xml   |   13 +-
 .../tika/pipes/emitter/fs/FileSystemEmitter.java   |   44 +-
 tika-pipes/tika-emitters/tika-emitter-s3/pom.xml   |   22 +-
 .../apache/tika/pipes/emitter/s3/S3Emitter.java    |  162 +-
 tika-pipes/tika-emitters/tika-emitter-solr/pom.xml |   13 +-
 .../tika/pipes/emitter/solr/SolrEmitter.java       |  133 +-
 .../apache/tika/pipes/emitter/solr/TestBasic.java  |   34 +-
 .../src/test/resources/log4j.properties            |    6 +-
 .../pipes/fetchiterator/csv/CSVFetchIterator.java  |   82 +-
 .../src/test/java/TestCSVFetchIterator.java        |   56 +-
 .../tika-fetch-iterator-jdbc/pom.xml               |   17 +-
 .../fetchiterator/jdbc/JDBCFetchIterator.java      |   84 +-
 .../fetchiterator/jdbc/TestJDBCFetchIterator.java  |   83 +-
 .../src/test/resources/log4j.properties            |    4 +-
 .../tika-fetch-iterator-s3/pom.xml                 |   22 +-
 .../pipes/fetchiterator/s3/S3FetchIterator.java    |   80 +-
 .../fetchiterator/s3/TestS3FetchIterator.java      |   26 +-
 .../src/test/resources/log4j.properties            |    4 +-
 tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml |   13 +-
 .../tika/pipes/fetcher/http/HttpFetcher.java       |   33 +-
 .../tika/pipes/fetcher/http/HttpFetcherTest.java   |   50 +-
 tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml   |    9 +
 .../apache/tika/pipes/fetcher/s3/S3Fetcher.java    |  157 +-
 .../tika/pipes/fetcher/s3/TestS3Fetcher.java       |   23 +-
 .../src/test/resources/tika-config-s3.xml          |    1 +
 .../org/apache/tika/client/HttpClientFactory.java  |  147 +-
 .../org/apache/tika/client/HttpClientUtil.java     |   26 +-
 tika-pipes/tika-pipes-async/pom.xml                |  101 +
 .../java/org/apache/tika/pipes/async/AsyncCli.java |  358 +++
 .../org/apache/tika/pipes/async/AsyncConfig.java   |   76 +
 .../org/apache/tika/pipes/async/AsyncData.java     |   57 +
 .../org/apache/tika/pipes/async/AsyncEmitHook.java |   11 +-
 .../org/apache/tika/pipes/async/AsyncEmitter.java  |  125 +
 .../tika/pipes/async/AsyncEmitterProcess.java      |  379 +++
 .../tika/pipes/async/AsyncPipesEmitHook.java       |   61 +
 .../apache/tika/pipes/async/AsyncProcessor.java    |  594 +++++
 .../tika/pipes/async/AsyncRuntimeException.java    |   12 +-
 .../org/apache/tika/pipes/async/AsyncTask.java     |   54 +
 .../org/apache/tika/pipes/async/AsyncWorker.java   |  195 ++
 .../tika/pipes/async/AsyncWorkerProcess.java       |  505 ++++
 .../src/main/resources/log4j.properties            |    6 +-
 .../tika/pipes/async/AsyncProcessorTest.java       |  105 +
 .../org/apache/tika/pipes/async/MockEmitter.java   |  103 +
 .../org/apache/tika/pipes/async/MockFetcher.java   |   20 +-
 .../apache/tika/pipes/async/SerializationTest.java |   49 +
 .../apache/tika/pipes/PipeIntegrationTests.java    |  103 +-
 .../src/test/resources/log4j.properties            |    4 +-
 tika-serialization/pom.xml                         |    5 +
 .../tika/metadata/serialization/JsonEmitData.java  |    2 +-
 .../metadata/serialization/JsonFetchEmitTuple.java |    6 +-
 .../serialization/JsonMetadataDeserializer.java    |   27 +-
 .../serialization/JsonMetadataSerializer.java      |   25 +-
 .../serialization/JsonFetchEmitTupleTest.java      |    6 +-
 tika-server/pom.xml                                |   38 +-
 .../server/classic/config/PDFServerConfig.java     |   42 +-
 .../classic/config/TesseractServerConfig.java      |   41 +-
 .../classic/resource/XMPMetadataResource.java      |   34 +-
 .../classic/writer/XMPMessageBodyWriter.java       |   26 +-
 .../src/main/resources/log4j.properties            |    4 +-
 .../tika/server/classic/DetectorResourceTest.java  |   55 +-
 .../apache/tika/server/classic/FetcherTest.java    |   35 +-
 .../tika/server/classic/MetadataResourceTest.java  |   96 +-
 .../classic/RecursiveMetadataFilterTest.java       |   42 +-
 .../classic/RecursiveMetadataResourceTest.java     |  215 +-
 .../tika/server/classic/TikaDetectorsTest.java     |   41 +-
 .../tika/server/classic/TikaMimeTypesTest.java     |   39 +-
 .../tika/server/classic/TikaParsersTest.java       |   46 +-
 .../tika/server/classic/TikaResourceTest.java      |  418 ++--
 .../tika/server/classic/UnpackerResourceTest.java  |   91 +-
 .../test/resources/config/TIKA-3137-include.xml    |   38 +-
 .../src/test/resources/log4j.properties            |    6 +-
 .../test/resources/test-documents/testHTML.html    |   20 +-
 .../org/apache/tika/server/client/TikaClient.java  |   33 +-
 .../apache/tika/server/client/TikaClientCLI.java   |   70 +-
 .../tika/server/client/TikaEmitterResult.java      |   24 +-
 .../apache/tika/server/client/TikaHttpClient.java  |   79 +-
 .../src/main/resources/log4j.properties            |    6 +-
 .../org/apache/tika/server/client/TestBasic.java   |   15 +-
 .../src/test/resources/log4j.properties            |    6 +-
 .../server/core/CompositeParseContextConfig.java   |   10 +-
 .../server/core/DefaultInputStreamFactory.java     |    9 +-
 .../tika/server/core/FetcherStreamFactory.java     |   17 +-
 .../org/apache/tika/server/core/HTMLHelper.java    |    7 +-
 .../tika/server/core/InputStreamFactory.java       |    9 +-
 .../org/apache/tika/server/core/MetadataList.java  |    7 +-
 .../tika/server/core/ParseContextConfig.java       |   16 +-
 .../org/apache/tika/server/core/ServerStatus.java  |  122 +-
 .../tika/server/core/ServerStatusWatcher.java      |   57 +-
 .../apache/tika/server/core/TikaLoggingFilter.java |    7 +-
 .../org/apache/tika/server/core/TikaServerCli.java |   39 +-
 .../apache/tika/server/core/TikaServerConfig.java  |  543 ++---
 .../tika/server/core/TikaServerParseException.java |    3 +-
 .../core/TikaServerParseExceptionMapper.java       |   12 +-
 .../apache/tika/server/core/TikaServerProcess.java |  194 +-
 .../tika/server/core/TikaServerWatchDog.java       |  222 +-
 .../apache/tika/server/core/WatchDogResult.java    |    7 +-
 .../server/core/config/DocumentSelectorConfig.java |   10 +-
 .../server/core/config/PasswordProviderConfig.java |   27 +-
 .../tika/server/core/resource/AsyncEmitter.java    |   30 +-
 .../tika/server/core/resource/AsyncParser.java     |   51 +-
 .../tika/server/core/resource/AsyncRequest.java    |    4 +-
 .../tika/server/core/resource/AsyncResource.java   |   58 +-
 .../server/core/resource/DetectorResource.java     |   21 +-
 .../tika/server/core/resource/EmitterResource.java |  144 +-
 .../server/core/resource/LanguageResource.java     |   55 +-
 .../server/core/resource/MetadataResource.java     |   62 +-
 .../core/resource/RecursiveMetadataResource.java   |  131 +-
 .../tika/server/core/resource/TikaDetectors.java   |   15 +-
 .../tika/server/core/resource/TikaMimeTypes.java   |   37 +-
 .../tika/server/core/resource/TikaParsers.java     |   43 +-
 .../tika/server/core/resource/TikaResource.java    |  249 +-
 .../server/core/resource/TikaServerStatus.java     |    8 +-
 .../tika/server/core/resource/TikaWelcome.java     |   44 +-
 .../server/core/resource/TranslateResource.java    |  135 +-
 .../server/core/resource/UnpackerResource.java     |   84 +-
 .../server/core/writer/CSVMessageBodyWriter.java   |   29 +-
 .../server/core/writer/JSONMessageBodyWriter.java  |   29 +-
 .../tika/server/core/writer/JSONObjWriter.java     |   30 +-
 .../core/writer/MetadataListMessageBodyWriter.java |   29 +-
 .../apache/tika/server/core/writer/TarWriter.java  |   25 +-
 .../server/core/writer/TextMessageBodyWriter.java  |   28 +-
 .../apache/tika/server/core/writer/ZipWriter.java  |   27 +-
 .../src/main/resources/tikaserver-template.html    |   18 +-
 .../main/resources/tikaserver-version.properties   |   15 +
 .../org/apache/tika/server/core/CXFTestBase.java   |   84 +-
 .../tika/server/core/IntegrationTestBase.java      |   92 +-
 .../tika/server/core/LanguageResourceTest.java     |  139 +-
 .../tika/server/core/NullWebClientLogger.java      |    5 +-
 .../apache/tika/server/core/ServerStatusTest.java  |   16 +-
 .../apache/tika/server/core/StackTraceOffTest.java |   54 +-
 .../apache/tika/server/core/StackTraceTest.java    |   62 +-
 .../apache/tika/server/core/TikaEmitterTest.java   |  162 +-
 .../apache/tika/server/core/TikaMimeTypesTest.java |   34 +-
 .../apache/tika/server/core/TikaResourceTest.java  |   60 +-
 .../core/TikaServerAsyncIntegrationTest.java       |  123 +-
 .../tika/server/core/TikaServerConfigTest.java     |   32 +-
 .../core/TikaServerEmitterIntegrationTest.java     |  148 +-
 .../server/core/TikaServerIntegrationTest.java     |  217 +-
 .../tika/server/core/TikaServerStatusTest.java     |   29 +-
 .../apache/tika/server/core/TikaVersionTest.java   |   20 +-
 .../apache/tika/server/core/TikaWelcomeTest.java   |   54 +-
 .../tika/server/core/TranslateResourceTest.java    |   90 +-
 .../src/test/resources/log4j.properties            |    6 +-
 .../test-documents/mock/heavy_hang_100.xml         |    2 +-
 .../test-documents/mock/heavy_hang_30000.xml       |    2 +-
 .../resources/test-documents/mock/system_exit.xml  |    2 +-
 .../test-documents/mock/testStaticStdOutErr.xml    |   45 +-
 .../test-documents/mock/testStdOutErr.xml          |   45 +-
 .../test-documents/mock/thread_interrupt.xml       |    2 +-
 1065 files changed, 42412 insertions(+), 38707 deletions(-)