This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch TIKA-4835-spill-sites
in repository https://gitbox.apache.org/repos/asf/tika.git
from a2eabc6943 Merge remote-tracking branch 'origin/main' into
TIKA-4835-spill-sites
add 3afde32dac TIKA-4837 - flag extra contents in ooxml files (#3063)
add 2d1e43ab32 TIKA-4843: fix per-request parse-context config for parsers
with lock… (#3076)
add 78ce40a186 Merge branch 'main' into TIKA-4835-spill-sites
No new revisions were added by this update.
Summary of changes:
CHANGES.txt | 44 ++---
.../main/java/org/apache/tika/metadata/Office.java | 32 ++++
.../apache/tika/metadata/metadata-key-fields.json | 2 +
.../org/apache/tika/metadata/metadata-keys.json | 2 +
.../ImageEmbeddingRuntimeConfigMergeTest.java | 78 +++++++++
.../ocr/tess4j/Tess4JRuntimeConfigMergeTest.java | 76 +++++++++
.../tika/parser/vlm/VLMRuntimeConfigMergeTest.java | 107 ++++++++++++
.../microsoft/ooxml/OOXMLExtractorFactory.java | 68 ++++++++
.../tika/parser/microsoft/ooxml/OOXMLParser.java | 98 ++++++-----
.../microsoft/ooxml/MacroPartResolutionTest.java | 145 +++++++++++++++++
.../microsoft/ooxml/ZipStructureCoverageTest.java | 181 +++++++++++++++++++++
.../apache/tika/config/loader/JsonMergeUtils.java | 39 ++++-
.../tika/config/loader/JsonMergeUtilsTest.java | 155 ++++++++++++++++++
13 files changed, 956 insertions(+), 71 deletions(-)
create mode 100644
tika-parsers/tika-parsers-ml/tika-inference/src/test/java/org/apache/tika/inference/ImageEmbeddingRuntimeConfigMergeTest.java
create mode 100644
tika-parsers/tika-parsers-ml/tika-parser-tess4j-module/src/test/java/org/apache/tika/parser/ocr/tess4j/Tess4JRuntimeConfigMergeTest.java
create mode 100644
tika-parsers/tika-parsers-ml/tika-vlm/src/test/java/org/apache/tika/parser/vlm/VLMRuntimeConfigMergeTest.java
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/MacroPartResolutionTest.java
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/ZipStructureCoverageTest.java
create mode 100644
tika-serialization/src/test/java/org/apache/tika/config/loader/JsonMergeUtilsTest.java
