This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-4381 in repository https://gitbox.apache.org/repos/asf/tika.git
commit 17a42231fa925874bb99bfb987c1c902bc67f897 Merge: 451140128 fa5ad17aa Author: tallison <[email protected]> AuthorDate: Wed Feb 12 12:25:48 2025 -0500 Merge remote-tracking branch 'origin/TIKA-4381' into TIKA-4381 # Conflicts: # tika-core/src/main/java/org/apache/tika/metadata/MAPI.java # tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/msg/ExtendedMetadataExtractor.java # tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/resources/org/apache/tika/parser/microsoft/msg/PIDShortID.csv # tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
