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/10/04 19:53:50 UTC
[tika] 06/06: 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 f37fbf056b5321737fb2b1e140b73c3cd246c95d
Merge: 2b3e101 8f3ccbc
Author: tallison <ta...@apache.org>
AuthorDate: Mon Oct 4 15:52:47 2021 -0400
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# CHANGES.txt
CHANGES.txt | 2 ++
.../org/apache/tika/mime/tika-mimetypes.xml | 30 ++++++++++++++++++++--
.../java/org/apache/tika/mime/TestMimeTypes.java | 7 +++++
.../src/test/resources/test-documents/testMARC.mrc | 1 +
4 files changed, 38 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 7c16d61,4b1e663..936cf77
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
Release 2.1.1 - ???
+ * Add detection of JPEG XL, MARC, ICC profiles, NES-ROM file types
+ (TIKA-3562 and TIKA-3563)
+ * Remove duplicate "subject" metadata keys that were intended
+ for backwards compatibility within 1.x only (TIKA-3564).
+
+ * Fix Open Office mime types to be subclasses of application/zip
+ and no longer require OPCPackageDetector-last ordering of zip
+ detectors (TIKA-3556).
+
+ * Add detection of JPEG XL file types (TIKA-3562)
* Improve robustness and features of the httpfetcher (TIKA-3543)