This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4568
in repository https://gitbox.apache.org/repos/asf/tika.git
from b6d25ea557 TIKA-4568 -- deprecate DigestingParser
add 75bf68bda6 TIKA-4553 - rm TikaConfig entirely (#2446)
add e5b07ee818 Merge branch 'main' into TIKA-4568
add fd9cbfe718 TIKA-4568 - deprecate DigestingParser and clean up
digesting throughout
No new revisions were added by this update.
Summary of changes:
.../tika/annotation/TikaComponentProcessor.java | 3 +-
.../src/main/java/org/apache/tika/cli/TikaCLI.java | 20 +-
.../test/java/org/apache/tika/cli/TikaCLITest.java | 2 +-
tika-core/src/main/java/org/apache/tika/Tika.java | 16 +-
.../java/org/apache/tika/config/ConfigBase.java | 610 --------
.../org/apache/tika/config/ConfigValidator.java | 62 +
.../main/java/org/apache/tika/config/Field.java | 45 -
.../java/org/apache/tika/config/Initializable.java | 29 +-
.../tika/config/InitializableProblemHandler.java | 87 --
.../org/apache/tika/config/LoadErrorHandler.java | 85 --
.../main/java/org/apache/tika/config/Param.java | 391 ------
.../java/org/apache/tika/config/ParamField.java | 158 ---
.../org/apache/tika/config/SelfConfiguring.java | 2 +-
.../java/org/apache/tika/config/ServiceLoader.java | 54 +-
.../java/org/apache/tika/config/TikaConfig.java | 1475 --------------------
.../apache/tika/config/TikaConfigSerializer.java | 639 ---------
.../org/apache/tika/detect/AutoDetectReader.java | 40 +-
.../apache/tika/detect/FileCommandDetector.java | 5 -
.../{parser => }/digest/CompositeDigester.java | 11 +-
.../java/org/apache/tika/digest/DigestDef.java | 134 ++
.../java/org/apache/tika/digest/DigestHelper.java | 83 ++
.../EncodingDetector.java => digest/Digester.java} | 37 +-
.../org/apache/tika/digest/DigesterFactory.java | 53 +
.../main/java/org/apache/tika/digest/Encoder.java | 20 +-
.../{parser => }/digest/InputStreamDigester.java | 50 +-
.../tika/digest/SkipContainerDocumentDigest.java | 49 +
.../tika/extractor/EmbeddedDocumentUtil.java | 31 +-
.../tika/extractor/ParserContainerExtractor.java | 8 +-
.../ParsingEmbeddedDocumentExtractorFactory.java | 2 -
.../tika/extractor/RUnpackExtractorFactory.java | 7 -
.../main/java/org/apache/tika/fork/ForkParser.java | 6 -
.../filter/CaptureGroupMetadataFilter.java | 15 +-
.../ClearByAttachmentTypeMetadataFilter.java | 2 -
.../metadata/filter/ClearByMimeMetadataFilter.java | 2 -
.../filter/DateNormalizingMetadataFilter.java | 2 -
.../filter/ExcludeFieldMetadataFilter.java | 2 -
.../metadata/filter/FieldNameMappingFilter.java | 3 -
.../metadata/filter/GeoPointMetadataFilter.java | 2 -
.../filter/IncludeFieldMetadataFilter.java | 2 -
.../tika/metadata/filter/MetadataFilter.java | 26 +-
.../metadata/writefilter/StandardWriteFilter.java | 3 +-
.../parser/AbstractEncodingDetectorParser.java | 3 +-
.../org/apache/tika/parser/AutoDetectParser.java | 27 +-
.../apache/tika/parser/AutoDetectParserConfig.java | 62 +-
.../tika/parser/AutoDetectParserFactory.java | 63 -
.../org/apache/tika/parser/DigestingParser.java | 55 +-
.../org/apache/tika/parser/RegexCaptureParser.java | 23 +-
.../parser/external/ExternalParsersFactory.java | 18 -
.../tika/parser/external2/ExternalParser.java | 25 +-
.../parser/multiple/AbstractMultipleParser.java | 17 -
.../tika/parser/multiple/FallbackParser.java | 8 -
.../tika/parser/multiple/SupplementingParser.java | 8 -
.../apache/tika/renderer/CompositeRenderer.java | 16 +-
.../org/apache/tika/utils/AnnotationUtils.java | 138 --
.../org/apache/tika/utils/ServiceLoaderUtils.java | 29 +-
.../src/test/java/org/apache/tika/TikaTest.java | 27 +-
.../apache/tika/config/AbstractTikaConfigTest.java | 61 -
.../org/apache/tika/config/MockConfigTest.java | 118 --
.../java/org/apache/tika/config/ParamTest.java | 67 -
.../tika/config/TikaConfigSerializerTest.java | 103 --
.../org/apache/tika/config/TikaConfigTest.java | 471 -------
.../tika/detect/FileCommandDetectorTest.java | 42 +-
.../org/apache/tika/detect/MagicDetectorTest.java | 3 +-
.../apache/tika/fork/ForkParserTikaBinTest.java | 31 +-
.../org/apache/tika/mime/MimeDetectionTest.java | 3 +-
.../org/apache/tika/mime/MimeTypesReaderTest.java | 3 +-
.../org/apache/tika/mime/RFC822DetectionTest.java | 3 +-
.../apache/tika/parser/CompositeParserTest.java | 15 +-
.../tika/parser/DummyInitializableParser.java | 83 --
.../tika/parser/DummyParameterizedParser.java | 134 --
.../tika/parser/InitializableParserTest.java | 45 -
.../tika/parser/ParameterizedParserTest.java | 114 --
.../tika/parser/external2/ExternalParserTest.java | 102 --
...erFactory.java => AutoDetectParserFactory.java} | 15 +-
.../org/apache/tika/parser/mock/VowelParser.java | 2 -
.../org/apache/tika/utils/AnnotationUtilsTest.java | 202 ---
.../org/apache/tika/utils/ConcurrentUtilsTest.java | 6 +-
.../org/apache/tika/config/FileCommandDetector.xml | 26 -
.../tika/config/TIKA-1445-default-except.xml | 31 -
.../apache/tika/config/TIKA-1508-configurable.xml | 37 -
.../tika/config/TIKA-1509-multiple-fallback.xml | 38 -
.../config/TIKA-1509-multiple-supplemental.xml | 46 -
.../org/apache/tika/config/TIKA-1642-CTakes.xml | 24 -
.../org/apache/tika/config/TIKA-1653-norepeat.xml | 32 -
.../org/apache/tika/config/TIKA-1700-dynamic.xml | 24 -
.../tika/config/TIKA-1700-unknown-parser.xml | 25 -
.../org/apache/tika/config/TIKA-1762-executors.xml | 31 -
.../tika/config/TIKA-1986-bad-parameters.xml | 26 -
.../org/apache/tika/config/TIKA-1986-bad-types.xml | 26 -
.../apache/tika/config/TIKA-1986-bad-values.xml | 26 -
.../apache/tika/config/TIKA-1986-initializable.xml | 28 -
.../config/TIKA-1986-parameterized-decorated.xml | 39 -
.../apache/tika/config/TIKA-1986-parameterized.xml | 38 -
.../tika/config/TIKA-1986-some-parameters.xml | 28 -
.../org/apache/tika/config/TIKA-2389-illegal.xml | 29 -
.../config/TIKA-2389-throw-default-overridden.xml | 30 -
.../apache/tika/config/TIKA-2389-throw-default.xml | 30 -
.../tika/config/TIKA-2389-throw-per-parser.xml | 29 -
.../tika/config/TIKA-2389-warn-per-parser.xml | 29 -
.../tika/config/TIKA-2732-xmlreaderutils-exc.xml | 20 -
.../tika/config/TIKA-2732-xmlreaderutils.xml | 20 -
.../org/apache/tika/config/TIKA-3137-exclude.xml | 27 -
.../apache/tika/config/TIKA-3137-field-mapping.xml | 31 -
.../apache/tika/config/TIKA-3137-include-uc.xml | 30 -
.../org/apache/tika/config/TIKA-3137-include.xml | 29 -
.../org/apache/tika/config/TIKA-3137-mimes-uc.xml | 28 -
.../tika/config/TIKA-3268-bad-parser-exclude.xml | 25 -
.../tika/config/TIKA-3551-xmlreaderutils.xml | 21 -
.../tika/config/TIKA-3557-exiftool-example.xml | 53 -
.../tika/config/TIKA-3557-no-output-parser.xml | 42 -
.../resources/org/apache/tika/config/TIKA-3557.xml | 41 -
.../resources/org/apache/tika/config/TIKA-3594.xml | 26 -
.../org/apache/tika/config/TIKA-3695-exclude.xml | 35 -
.../org/apache/tika/config/TIKA-3695-fields.xml | 40 -
.../resources/org/apache/tika/config/TIKA-3695.xml | 33 -
.../config/TIKA-4133-capture-group-overwrite.xml | 26 -
.../apache/tika/config/TIKA-4133-capture-group.xml | 26 -
.../config/TIKA-4207-embedded-bytes-config.xml | 38 -
.../config/TIKA-4261-clear-by-embedded-type.xml | 27 -
.../tika/config/TIKA-4427-max-num-reuses.xml | 20 -
.../apache/tika/config/TIKA-4427-no-sax-pool.xml | 20 -
.../org/apache/tika/config/TIKA-866-composite.xml | 22 -
.../org/apache/tika/config/TIKA-866-invalid.xml | 22 -
.../org/apache/tika/config/TIKA-866-valid.xml | 22 -
.../org/apache/tika/config/mock-exclude.xml | 25 -
.../org/apache/tika/config/mockConfig.xml | 35 -
.../tika/metadata/filter/metadatafilter-config.xml | 22 -
.../apache/tika/detect/magika/MagikaDetector.java | 5 -
.../tika/detect/siegfried/SiegfriedDetector.java | 5 -
.../tika/example/DumpTikaConfigExampleTest.java | 20 +-
.../org/apache/tika/pipes/grpc/TikaGrpcServer.java | 10 +-
.../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 37 +-
.../tika/pipes/kafka/tests/TikaPipesKafkaTest.java | 2 +-
.../src/test/resources/kafka/plugins-template.json | 2 +-
.../pipes/opensearch/tests/OpenSearchTest.java | 2 +-
.../resources/opensearch/plugins-template.json | 2 +-
.../opensearch/tika-config-opensearch.json | 4 +-
.../tika-pipes-s3-integration-tests/pom.xml | 10 +
.../tika/pipes/s3/tests/S3PipeIntegrationTest.java | 2 +-
.../src/test/resources/s3/plugins-template.json | 2 +-
.../pipes/solr/tests/TikaPipesSolrTestBase.java | 2 +-
.../src/test/resources/solr/plugins-template.json | 2 +-
.../src/test/resources/tika-config-solr-urls.json | 2 +-
.../metadatafilter/OpenNLPMetadataFilter.java | 2 -
.../metadatafilter/OptimaizeMetadataFilter.java | 2 -
tika-parent/pom.xml | 1 -
.../org/apache/tika/parser/gdal/GDALParser.java | 4 -
.../org/apache/tika/parser/isatab/ISATabUtils.java | 7 +-
.../apache/tika/parser/geopkg/GeoPkgParser.java | 21 -
.../apache/tika/parser/sqlite3/SQLite3Parser.java | 22 +-
.../pom.xml | 6 +
.../apache/tika/mime/TestMimeTypesExtended.java | 5 +-
.../java/org/apache/tika/parser/ocr/TestOCR.java | 15 +-
.../config/tika-config-restricted-gdal.xml | 32 -
.../ocr/configs/tika-config-restricted-gdal.json | 14 +
tika-parsers/tika-parsers-ml/pom.xml | 5 +
.../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 8 +
.../apache/tika/parser/ctakes/CTAKESParser.java | 15 +-
.../apache/tika/parser/geo/topic/GeoParser.java | 3 -
.../apache/tika/parser/ner/NamedEntityParser.java | 6 +-
.../parser/sentiment/SentimentAnalysisParser.java | 13 +-
.../tika/parser/geo/topic/GeoParserTest.java | 8 +-
.../tika/parser/ner/NamedEntityParserTest.java | 79 +-
.../tika/parser/ner/nltk/NLTKNERecogniserTest.java | 17 +-
.../parser/ner/regex/RegexNERecogniserTest.java | 19 +-
.../sentiment/SentimentAnalysisParserTest.java | 37 +-
.../configs/TIKA-3078-geo.topic.GeoParser.json | 11 +
.../configs/tika-config-sentiment-opennlp-cat.json | 10 +
.../configs/tika-config-sentiment-opennlp.json | 10 +
.../src/test/resources/configs/tika-config.json | 9 +
.../tika/config/TIKA-3078-geo.topic.GeoParser.xml | 30 -
.../apache/tika/parser/ner/regex/tika-config.xml | 27 -
.../org/apache/tika/parser/ner/tika-config.xml | 27 -
.../tika-config-sentiment-opennlp-cat.xml | 28 -
.../sentiment/tika-config-sentiment-opennlp.xml | 29 -
.../parser/transcribe/aws/AmazonTranscribe.java | 17 +-
.../transcribe/aws/AmazonTranscribeTest.java | 11 +-
.../parser/transcribe/aws/configs/tika-config.json | 13 +
.../tika-parsers-standard-modules/pom.xml | 6 +
.../java/org/apache/tika/parser/mp3/Mp3Parser.java | 2 -
.../apache/tika/parser/dwg/AbstractDWGParser.java | 7 -
.../apache/tika/parser/dwg/DWGParserConfig.java | 10 +-
.../org/apache/tika/parser/dwg/DWGParserTest.java | 20 +-
.../configs/tika-config-dwgRead-Timeout.json | 10 +
.../resources/configs/tika-config-dwgRead.json | 9 +
.../test-configs/tika-config-dwgRead-Timeout.xml | 27 -
.../resources/test-configs/tika-config-dwgRead.xml | 26 -
.../parser/digestutils/BouncyCastleDigester.java | 107 +-
.../digestutils/BouncyCastleDigesterFactory.java | 80 ++
.../tika/parser/digestutils/CommonsDigester.java | 199 +--
.../parser/digestutils/CommonsDigesterFactory.java | 61 +-
.../tika/parser/html/HtmlEncodingDetector.java | 3 -
.../org/apache/tika/parser/html/JSoupParser.java | 3 -
.../StandardHtmlEncodingDetector.java | 3 -
.../apache/tika/parser/html/HtmlParserTest.java | 39 +-
.../configs/tika-config-html-extract-scripts.json} | 6 +-
.../org/apache/tika/parser/html/tika-config.xml | 30 -
.../org/apache/tika/parser/image/BPGParser.java | 2 -
.../org/apache/tika/parser/image/PSDParser.java | 2 -
.../apache/tika/parser/image/PSDParserTest.java | 8 +-
.../resources/configs/tika-config-TIKA-3243.json | 10 +
.../tika/parser/image/tika-config-TIKA-3243.xml | 29 -
.../org/apache/tika/parser/mail/RFC822Parser.java | 2 -
.../apache/tika/parser/mail/RFC822ParserTest.java | 16 +-
.../tika-config-extract-all-alternatives.json} | 6 +-
.../mail/tika-config-extract-all-alternatives.xml | 30 -
.../detect/microsoft/POIFSContainerDetector.java | 2 -
.../parser/microsoft/AbstractOfficeParser.java | 12 -
.../parser/microsoft/AbstractPOIFSExtractor.java | 6 -
.../tika/parser/microsoft/HSLFExtractor.java | 3 +-
.../tika/parser/microsoft/libpst/LibPstParser.java | 18 +-
.../tika/parser/microsoft/rtf/RTFParser.java | 35 +-
.../tika/parser/microsoft/ExcelParserTest.java | 38 +-
.../tika/parser/microsoft/OutlookParserTest.java | 34 +-
.../tika/parser/microsoft/WordParserTest.java | 22 +-
.../parser/microsoft/libpst/TestLibPstParser.java | 13 +-
.../parser/microsoft/ooxml/OOXMLParserTest.java | 83 +-
.../parser/microsoft/ooxml/SXSLFExtractorTest.java | 15 +-
.../parser/microsoft/ooxml/SXWPFExtractorTest.java | 16 +-
.../tika/parser/microsoft/rtf/RTFParserTest.java | 38 +-
.../configs/ignoreListMarkup-tika-config.json | 9 +
.../configs/tika-config-custom-date-override.json | 15 +
.../resources/configs/tika-config-dom-macros.json | 15 +
.../configs/tika-config-exclude-phonetic.json | 15 +
.../tika-config-extract-all-alternatives-msg.json | 10 +
.../configs/tika-config-headers-footers.json | 15 +
.../test/resources/configs/tika-config-macros.json | 15 +
.../resources/configs/tika-config-sax-docx.json | 10 +
.../resources/configs/tika-config-sax-macros.json | 17 +
.../src/test/resources/configs/tika-config.json | 9 +
.../resources/configs/tika-libpst-config.json} | 4 +-
.../resources/configs/tika-libpst-eml-config.json} | 4 +-
.../parser/microsoft/libpst/tika-libpst-config.xml | 26 -
.../microsoft/libpst/tika-libpst-eml-config.xml | 30 -
.../ooxml/tika-config-custom-date-override.xml | 32 -
.../microsoft/ooxml/tika-config-dom-macros.xml | 32 -
.../microsoft/ooxml/tika-config-sax-macros.xml | 34 -
.../microsoft/rtf/ignoreListMarkup-tika-config.xml | 26 -
.../tika/parser/microsoft/rtf/tika-config.xml | 26 -
.../microsoft/tika-config-custom-date-override.xml | 32 -
.../microsoft/tika-config-exclude-phonetic.xml | 32 -
.../tika-config-extract-all-alternatives-msg.xml | 30 -
.../microsoft/tika-config-headers-footers.xml | 32 -
.../tika/parser/microsoft/tika-config-macros.xml | 32 -
.../tika/parser/microsoft/tika-config-sax-docx.xml | 27 -
.../apache/tika/detect/ole/MiscOLEDetector.java | 2 -
.../org/apache/tika/parser/epub/EpubParser.java | 3 -
.../tika/parser/odf/FlatOpenDocumentParser.java | 2 -
.../apache/tika/parser/odf/OpenDocumentParser.java | 2 -
.../tika/parser/wordperfect/WordPerfectParser.java | 3 -
.../apache/tika/parser/epub/EpubParserTest.java | 27 +-
.../tika/parser/wordperfect/WordPerfectTest.java | 19 +-
.../configs/tika-config-epub-streaming.json | 10 +
.../tika-config-wordperfect-no-deleted.json | 10 +
.../tika/parser/epub/configs/tika-config.json | 9 +
.../org/apache/tika/parser/epub/tika-config.xml | 26 -
.../tika/parser/odf/tika-config-detectors.xml | 32 -
.../apache/tika/parser/odf/tika-config-macros.xml | 32 -
.../parser/wordperfect/configs/tika-config.json | 9 +
.../apache/tika/parser/wordperfect/tika-config.xml | 26 -
.../apache/tika/parser/ocr/TesseractOCRConfig.java | 20 +-
.../apache/tika/parser/ocr/TesseractOCRParser.java | 33 +-
.../tika/parser/ocr/TesseractOCRConfigTest.java | 17 +-
.../tika/parser/ocr/TesseractOCRParserTest.java | 114 +-
.../resources/configs/TIKA-3582-tesseract.json | 10 +
.../test/resources/configs/tika-config-psm0.json | 10 +
.../configs/tika-config-tesseract-arbitrary.json | 12 +
.../configs/tika-config-tesseract-full.json | 20 +
.../configs/tika-config-tesseract-load-langs.json | 10 +
.../configs/tika-config-tesseract-partial.json | 18 +
.../resources/test-configs/TIKA-2705-tesseract.xml | 32 -
.../resources/test-configs/TIKA-3582-tesseract.xml | 29 -
.../resources/test-configs/tika-config-psm0.xml | 29 -
.../tika-config-tesseract-arbitrary.xml | 30 -
.../test-configs/tika-config-tesseract-full.xml | 39 -
.../tika-config-tesseract-load-langs.xml | 29 -
.../test-configs/tika-config-tesseract-partial.xml | 38 -
.../tika-parser-pdf-module/pom.xml | 6 -
.../java/org/apache/tika/parser/pdf/PDFParser.java | 61 +-
.../tika/renderer/pdf/pdfbox/PDFBoxRenderer.java | 18 +-
.../apache/tika/parser/pkg/CompressorParser.java | 3 -
.../org/apache/tika/parser/pkg/PackageParser.java | 2 -
.../apache/tika/parser/pkg/PackageParserTest.java | 7 +-
.../apache/tika/parser/pkg/tika-gzip-config.xml | 29 -
.../apache/tika/parser/pkg/tika-unrar-config.xml | 26 -
.../apache/tika/parser/csv/TextAndCSVConfig.java | 54 +-
.../apache/tika/parser/csv/TextAndCSVParser.java | 47 +-
.../apache/tika/parser/strings/StringsParser.java | 15 +-
.../tika/parser/txt/Icu4jEncodingDetector.java | 4 -
.../tika/parser/txt/UniversalEncodingDetector.java | 2 -
.../tika/parser/csv/TextAndCSVParserTest.java | 20 +-
.../tika/parser/strings/StringsConfigTest.java | 29 +-
.../tika/parser/strings/StringsParserTest.java | 7 +-
.../tika/parser/txt/CharsetDetectorTest.java | 9 +-
.../configs/tika-config-colon-delimiter.json | 13 +
.../test/resources/configs/tika-config-csv.json | 10 +
.../configs/tika-config-ignore-charset.json | 13 +
.../configs/tika-config-strings-full.json | 11 +
.../configs/tika-config-strings-partial.json | 10 +
.../org/apache/tika/parser/csv/tika-config.xml | 30 -
.../test-configs/tika-config-colon-delimiter.xml | 30 -
.../test-configs/tika-config-ignore-charset.xml | 33 -
.../test-configs/tika-config-strings-full.xml | 28 -
.../test-configs/tika-config-strings-partial.xml | 27 -
.../detect/zip/DefaultZipContainerDetector.java | 10 +-
.../detect/zip/StreamingZipContainerDetector.java | 4 +-
.../tika/parser/AutoDetectParserConfigTest.java | 10 +-
.../apache/tika/parser/AutoDetectParserTest.java | 4 +-
.../parser/BouncyCastleDigestingParserTest.java | 256 ----
.../apache/tika/parser/DigestingParserTest.java | 288 ----
.../tika/parser/RecursiveParserWrapperTest.java | 6 +-
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 5 +-
.../src/test/resources/configs/tika-4533.json | 4 +-
.../configs/tika-config-digests-pdf-only.json | 5 +-
.../tika-config-digests-skip-container.json | 7 +-
.../resources/configs/tika-config-digests.json | 5 +-
...a-config-upcasing-custom-handler-decorator.json | 4 +-
.../configs/tika-config-write-filter.json | 12 +-
.../core/reporter/CompositePipesReporter.java | 2 -
.../tika/pipes/core/server/ParseHandler.java | 11 +-
.../apache/tika/pipes/core/server/PipesServer.java | 29 +-
.../tika/pipes/core/TikaPipesConfigTest.java | 4 +-
.../test/resources/configs/TIKA-3865-params.xml | 29 -
.../test/resources/configs/TIKA-4207-emitter.xml | 35 -
.../test/resources/configs/tika-config-broken.xml | 32 -
.../org/apache/tika/config/emitters-config.xml | 27 -
.../tika/config/emitters-duplicate-config.xml | 31 -
.../apache/tika/config/pipes-iterator-config.xml | 26 -
.../tika/config/pipes-iterator-multiple-config.xml | 33 -
tika-pipes/tika-pipes-integration-tests/pom.xml | 7 +
.../tika/pipes/core/TikaPipesConfigTest.java | 6 +-
.../tika/pipes/core/async/MockDigesterFactory.java | 24 +-
.../apache/tika/pipes/core/async/MockReporter.java | 2 -
.../test/resources/configs/tika-config-basic.json | 4 +-
.../resources/configs/tika-config-passback.json | 4 +-
.../resources/configs/tika-config-truncate.json | 4 +-
.../tika/pipes/fetcher/azblob/AZBlobFetcher.java | 9 +-
.../pipes/iterator/azblob/AZBlobPipesIterator.java | 9 +-
.../iterator/filelist/FileListPipesIterator.java | 63 +-
.../pipes/iterator/fs/FileSystemPipesIterator.java | 4 +-
.../apache/tika/pipes/fetcher/gcs/GCSFetcher.java | 7 +-
.../tika/pipes/fetcher/http/HttpFetcherTest.java | 4 +-
.../test/resources/configs/tika-config-http.xml | 32 -
.../pipes/iterator/kafka/KafkaPipesIterator.java | 6 +-
.../emitter/opensearch/OpenSearchEmitter.java | 7 +-
.../apache/tika/pipes/fetcher/s3/S3Fetcher.java | 7 +-
tika-serialization/pom.xml | 26 +
.../tika/config/loader/ComponentInstantiator.java | 29 +-
.../apache/tika/config/loader/DetectorLoader.java | 3 -
.../org/apache/tika/config/loader/TikaLoader.java | 13 +-
.../config/loader/TikaObjectMapperFactory.java | 1 +
.../tika/config/loader/TranslatorLoader.java | 6 +-
.../tika/serialization/TikaAbstractTypeMixins.java | 2 +-
.../src/test/java/org/apache/tika/TikaTest.java | 28 +-
.../filter/AttachmentCountingListFilter.java | 2 +
.../metadata/filter/MetadataListFilterTest.java | 15 +-
.../tika/metadata/filter/MockUpperCaseFilter.java | 2 +
.../tika/metadata/filter/TestMetadataFilter.java | 42 +-
.../writefilter/StandardWriteFilterTest.java | 31 +-
.../tika/parser/AutoDetectParserConfigTest.java | 18 +-
.../tika/parser/external2/ExternalParserTest.java | 102 ++
.../test/resources/configs/TIKA-3137-exclude.json | 9 +
.../resources/configs/TIKA-3137-field-mapping.json | 15 +
.../resources/configs/TIKA-3137-include-uc.json | 12 +
.../test/resources/configs/TIKA-3137-include.json | 9 +
.../test/resources/configs/TIKA-3137-mimes-uc.json | 12 +
.../configs/TIKA-3557-exiftool-example.json | 20 +
.../configs/TIKA-3557-no-output-parser.json | 10 +
.../src/test/resources/configs/TIKA-3557.json | 17 +
.../test/resources/configs/TIKA-3695-exclude.json | 14 +
.../test/resources/configs/TIKA-3695-fields.json | 18 +
.../src/test/resources/configs/TIKA-3695.json | 14 +
.../configs/TIKA-4133-capture-group-overwrite.json | 11 +
.../resources/configs/TIKA-4133-capture-group.json | 11 +
.../configs/TIKA-4207-embedded-bytes-config.json | 16 +
.../configs/TIKA-4261-clear-by-embedded-type.json | 9 +
.../resources/configs/example-tika-config.json | 4 +-
.../resources/configs/metadatafilter-config.json | 5 +
.../src/test/resources/test-documents/example.xml | 0
.../test-documents/testOverlappingText.pdf | Bin
.../tika/server/client/TikaServerClientConfig.java | 19 +-
.../org/apache/tika/server/client/TestBasic.java | 4 +-
.../resources/tika-config-simple-fs-emitter.json | 11 +
.../resources/tika-config-simple-fs-emitter.xml | 106 --
.../apache/tika/server/core/TikaServerConfig.java | 3 +-
.../org/apache/tika/server/core/TlsConfig.java | 15 +-
.../server/core/resource/TranslateResource.java | 3 +-
.../org/apache/tika/server/core/CXFTestBase.java | 9 +-
.../tika/server/core/TikaServerConfigTest.java | 24 +-
.../resources/configs/cxf-test-base-template.json | 10 +-
.../tika/server/standard/UnpackerResourceTest.java | 8 +-
.../standard/UnpackerResourceWithConfigTest.java | 14 +-
.../resources/configs/cxf-test-base-template.json | 10 +-
.../configs/tika-config-for-server-tests.json | 10 +-
.../tika-config-langdetect-opennlp-filter.json | 10 +-
.../tika-config-langdetect-optimaize-filter.json | 10 +-
396 files changed, 2466 insertions(+), 10832 deletions(-)
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/ConfigBase.java
create mode 100644
tika-core/src/main/java/org/apache/tika/config/ConfigValidator.java
delete mode 100644 tika-core/src/main/java/org/apache/tika/config/Field.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/InitializableProblemHandler.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/LoadErrorHandler.java
delete mode 100644 tika-core/src/main/java/org/apache/tika/config/Param.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/ParamField.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/TikaConfigSerializer.java
rename tika-core/src/main/java/org/apache/tika/{parser =>
}/digest/CompositeDigester.java (82%)
create mode 100644
tika-core/src/main/java/org/apache/tika/digest/DigestDef.java
create mode 100644
tika-core/src/main/java/org/apache/tika/digest/DigestHelper.java
copy tika-core/src/main/java/org/apache/tika/{detect/EncodingDetector.java =>
digest/Digester.java} (50%)
create mode 100644
tika-core/src/main/java/org/apache/tika/digest/DigesterFactory.java
copy
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/fsshttpb/IFSSHTTPBSerializable.java
=> tika-core/src/main/java/org/apache/tika/digest/Encoder.java (68%)
rename tika-core/src/main/java/org/apache/tika/{parser =>
}/digest/InputStreamDigester.java (79%)
create mode 100644
tika-core/src/main/java/org/apache/tika/digest/SkipContainerDocumentDigest.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/parser/AutoDetectParserFactory.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/config/MockConfigTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/config/ParamTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/parser/DummyInitializableParser.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/parser/DummyParameterizedParser.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/parser/InitializableParserTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/parser/ParameterizedParserTest.java
delete mode 100644
tika-core/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java
copy
tika-core/src/test/java/org/apache/tika/parser/mock/{MockParserFactory.java =>
AutoDetectParserFactory.java} (76%)
delete mode 100644
tika-core/src/test/java/org/apache/tika/utils/AnnotationUtilsTest.java
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/FileCommandDetector.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1445-default-except.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1508-configurable.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1509-multiple-fallback.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1509-multiple-supplemental.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1642-CTakes.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1653-norepeat.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1700-dynamic.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1700-unknown-parser.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1762-executors.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-bad-parameters.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-bad-types.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-bad-values.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-initializable.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-parameterized-decorated.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-parameterized.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-some-parameters.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2389-illegal.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2389-throw-default-overridden.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2389-throw-default.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2389-throw-per-parser.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2389-warn-per-parser.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2732-xmlreaderutils-exc.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-2732-xmlreaderutils.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3137-exclude.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3137-field-mapping.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3137-include-uc.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3137-include.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3137-mimes-uc.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3268-bad-parser-exclude.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3551-xmlreaderutils.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3557-exiftool-example.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3557-no-output-parser.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3557.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3594.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3695-exclude.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3695-fields.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-3695.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4133-capture-group-overwrite.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4133-capture-group.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4207-embedded-bytes-config.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4261-clear-by-embedded-type.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4427-max-num-reuses.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-4427-no-sax-pool.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-866-composite.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-866-invalid.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/TIKA-866-valid.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/mock-exclude.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/config/mockConfig.xml
delete mode 100644
tika-core/src/test/resources/org/apache/tika/metadata/filter/metadatafilter-config.xml
delete mode 100644
tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/resources/config/tika-config-restricted-gdal.xml
create mode 100644
tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/src/test/resources/org/apache/tika/parser/ocr/configs/tika-config-restricted-gdal.json
create mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/configs/TIKA-3078-geo.topic.GeoParser.json
create mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/configs/tika-config-sentiment-opennlp-cat.json
create mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/configs/tika-config-sentiment-opennlp.json
create mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/configs/tika-config.json
delete mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/config/TIKA-3078-geo.topic.GeoParser.xml
delete mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/regex/tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/ner/tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp-cat.xml
delete mode 100644
tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/resources/org/apache/tika/parser/sentiment/tika-config-sentiment-opennlp.xml
create mode 100644
tika-parsers/tika-parsers-ml/tika-transcribe-aws/src/test/resources/org/apache/tika/parser/transcribe/aws/configs/tika-config.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/resources/configs/tika-config-dwgRead-Timeout.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/resources/configs/tika-config-dwgRead.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/resources/test-configs/tika-config-dwgRead-Timeout.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/test/resources/test-configs/tika-config-dwgRead.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/BouncyCastleDigesterFactory.java
copy
tika-parsers/tika-parsers-standard/{tika-parsers-standard-package/src/test/resources/configs/tika-config-extract-scripts.json
=>
tika-parsers-standard-modules/tika-parser-html-module/src/test/resources/configs/tika-config-html-extract-scripts.json}
(70%)
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/test/resources/org/apache/tika/parser/html/tika-config.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/resources/configs/tika-config-TIKA-3243.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/resources/org/apache/tika/parser/image/tika-config-TIKA-3243.xml
copy
tika-parsers/tika-parsers-standard/{tika-parsers-standard-package/src/test/resources/configs/tika-config-rfc822-extract-alternatives.json
=>
tika-parsers-standard-modules/tika-parser-mail-module/src/test/resources/configs/tika-config-extract-all-alternatives.json}
(71%)
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/src/test/resources/org/apache/tika/parser/mail/tika-config-extract-all-alternatives.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/ignoreListMarkup-tika-config.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-custom-date-override.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-dom-macros.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-exclude-phonetic.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-extract-all-alternatives-msg.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-headers-footers.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-macros.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-sax-docx.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config-sax-macros.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-config.json
copy
tika-parsers/tika-parsers-standard/{tika-parsers-standard-package/src/test/resources/configs/tika-config-lib-pst.json
=>
tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-libpst-config.json}
(81%)
copy
tika-parsers/tika-parsers-standard/{tika-parsers-standard-package/src/test/resources/configs/tika-config-lib-pst.json
=>
tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/configs/tika-libpst-eml-config.json}
(72%)
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/libpst/tika-libpst-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/libpst/tika-libpst-eml-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-custom-date-override.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-dom-macros.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/ooxml/tika-config-sax-macros.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/ignoreListMarkup-tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/rtf/tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-custom-date-override.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-exclude-phonetic.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-extract-all-alternatives-msg.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-headers-footers.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-macros.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/org/apache/tika/parser/microsoft/tika-config-sax-docx.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/configs/tika-config-epub-streaming.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/configs/tika-config-wordperfect-no-deleted.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/configs/tika-config.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/epub/tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-detectors.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/configs/tika-config.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/org/apache/tika/parser/wordperfect/tika-config.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/TIKA-3582-tesseract.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/tika-config-psm0.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/tika-config-tesseract-arbitrary.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/tika-config-tesseract-full.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/tika-config-tesseract-load-langs.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/configs/tika-config-tesseract-partial.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/TIKA-2705-tesseract.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/TIKA-3582-tesseract.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/tika-config-psm0.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/tika-config-tesseract-arbitrary.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/tika-config-tesseract-full.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/tika-config-tesseract-load-langs.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/test/resources/test-configs/tika-config-tesseract-partial.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-gzip-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/test/resources/org/apache/tika/parser/pkg/tika-unrar-config.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/configs/tika-config-colon-delimiter.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/configs/tika-config-csv.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/configs/tika-config-ignore-charset.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/configs/tika-config-strings-full.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/configs/tika-config-strings-partial.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/org/apache/tika/parser/csv/tika-config.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/test-configs/tika-config-colon-delimiter.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/test-configs/tika-config-ignore-charset.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/test-configs/tika-config-strings-full.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/resources/test-configs/tika-config-strings-partial.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/BouncyCastleDigestingParserTest.java
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/DigestingParserTest.java
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/configs/TIKA-3865-params.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/configs/TIKA-4207-emitter.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/configs/tika-config-broken.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/emitters-config.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/emitters-duplicate-config.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
delete mode 100644
tika-pipes/tika-pipes-plugins/tika-pipes-http/src/test/resources/configs/tika-config-http.xml
copy {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/TikaTest.java (97%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/metadata/filter/AttachmentCountingListFilter.java
(95%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/metadata/filter/MetadataListFilterTest.java
(77%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/metadata/filter/MockUpperCaseFilter.java
(95%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
(85%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/metadata/writefilter/StandardWriteFilterTest.java
(92%)
rename {tika-core =>
tika-serialization}/src/test/java/org/apache/tika/parser/AutoDetectParserConfigTest.java
(83%)
create mode 100644
tika-serialization/src/test/java/org/apache/tika/parser/external2/ExternalParserTest.java
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3137-exclude.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3137-field-mapping.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3137-include-uc.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3137-include.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3137-mimes-uc.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3557-exiftool-example.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3557-no-output-parser.json
create mode 100644 tika-serialization/src/test/resources/configs/TIKA-3557.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3695-exclude.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-3695-fields.json
create mode 100644 tika-serialization/src/test/resources/configs/TIKA-3695.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-4133-capture-group-overwrite.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-4133-capture-group.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-4207-embedded-bytes-config.json
create mode 100644
tika-serialization/src/test/resources/configs/TIKA-4261-clear-by-embedded-type.json
create mode 100644
tika-serialization/src/test/resources/configs/metadatafilter-config.json
copy {tika-core =>
tika-serialization}/src/test/resources/test-documents/example.xml (100%)
copy {tika-core =>
tika-serialization}/src/test/resources/test-documents/testOverlappingText.pdf
(100%)
create mode 100644
tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.json
delete mode 100644
tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
