[tika] 02/04: Merge remote-tracking branch 'origin/main'
This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git commit 422bdef904706b8489844df7e44f2da0896ac531 Merge: 062e607ee 3357e4463 Author: tallison AuthorDate: Mon Jul 24 11:40:50 2023 -0400 Merge remote-tracking branch 'origin/main' .../resources/org/apache/tika/mime/tika-mimetypes.xml| 6 +- tika-parent/pom.xml | 6 +++--- tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 2 +- .../tika/detect/microsoft/POIFSContainerDetector.java| 4 ++-- .../tika/parser/microsoft/AbstractPOIFSExtractor.java| 16 ++-- .../parser/microsoft/ooxml/AbstractOOXMLExtractor.java | 16 .../java/org/apache/tika/parser/pkg/PackageParser.java | 4 +++- .../apache/tika/detect/TestContainerAwareDetector.java | 7 +++ 8 files changed, 51 insertions(+), 10 deletions(-)
[tika] 02/04: 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 main in repository https://gitbox.apache.org/repos/asf/tika.git commit 880dcbbfe201bcf363ba06b25c84c575b0ec7e63 Merge: b6c8803 60a61dc Author: tallison AuthorDate: Thu Jan 20 11:21:09 2022 -0500 Merge remote-tracking branch 'origin/main' into main CHANGES.txt| 4 +++ tika-core/pom.xml | 29 + .../java/org/apache/tika/config/ConfigBase.java| 2 +- .../java/org/apache/tika/config/ServiceLoader.java | 4 +-- .../java/org/apache/tika/config/TikaConfig.java| 2 +- .../java/org/apache/tika/detect/NameDetector.java | 6 ++-- .../apache/tika/detect/TrainedModelDetector.java | 19 +-- .../apache/tika/language/detect/LanguageNames.java | 4 +-- .../main/java/org/apache/tika/metadata/PDF.java| 9 + .../java/org/apache/tika/metadata/Property.java| 6 ++-- .../apache/tika/metadata/filter/NoOpFilter.java| 2 +- .../mime/ProbabilisticMimeDetectionSelector.java | 2 +- .../apache/tika/parser/RecursiveParserWrapper.java | 2 +- .../tika/parser/external/ExternalParser.java | 14 .../external/ExternalParsersConfigReader.java | 4 ++- .../java/org/apache/tika/pipes/HandlerConfig.java | 2 +- .../java/org/apache/tika/pipes/PipesReporter.java | 2 +- .../java/org/apache/tika/pipes/PipesResult.java| 16 + .../org/apache/tika/utils/AnnotationUtils.java | 5 --- .../apache/tika/parser/pdf/AbstractPDF2XHTML.java | 38 ++ .../org/apache/tika/parser/pdf/PDFParserTest.java | 2 ++ 21 files changed, 122 insertions(+), 52 deletions(-)
