This is an automated email from the ASF dual-hosted git repository. tballison pushed a commit to branch TIKA-4809-stage-7 in repository https://gitbox.apache.org/repos/asf/tika.git
commit d7d428e5e6b35e0e8eb08187f06cb4f07fda3ff0 Merge: 8cf724e51c 0b84d33943 Author: tallison <[email protected]> AuthorDate: Tue Aug 11 06:59:45 2026 -0400 Merge remote-tracking branch 'origin/main' into TIKA-4809-stage-7 .../migration-to-4x/migrating-tika-server-4x.adoc | 69 ++++++++ .../pages/migration-to-4x/migrating-to-4x.adoc | 2 +- docs/modules/ROOT/pages/pipes/cpu-sizing.adoc | 2 +- .../ROOT/pages/using-tika/server/index.adoc | 33 +--- .../org/apache/tika/parser/mp3/ID3v2Frame.java | 16 +- .../java/org/apache/tika/parser/mp4/MP4Parser.java | 30 +++- .../org/apache/tika/parser/mp4/TikaMp4Reader.java | 149 +++++++++++++++++ .../tika/parser/mp4/TikaMp4SoundHandler.java | 15 +- .../tika/parser/mp4/boxes/TikaUserDataBox.java | 167 +++++++++---------- .../org/apache/tika/parser/video/FLVParser.java | 53 ++++-- .../org/apache/tika/parser/mp3/ID3v2FrameTest.java | 13 ++ .../org/apache/tika/parser/mp3/Mp3ParserTest.java | 22 +++ .../org/apache/tika/parser/mp4/MP4ParserTest.java | 109 ++++++++++++ .../tika/parser/mp4/boxes/TikaUserDataBoxTest.java | 61 +++++++ .../apache/tika/parser/video/FLVParserTest.java | 22 +++ .../org/apache/tika/server/core/TikaServerCli.java | 4 +- .../apache/tika/server/core/TikaServerConfig.java | 64 +++---- .../apache/tika/server/core/TikaServerProcess.java | 20 +-- .../core/resource/RecursiveMetadataResource.java | 43 +---- .../server/core/resource/ServerHandlerConfig.java | 37 ----- .../tika/server/core/resource/TikaResource.java | 115 +++---------- .../main/resources/tika-server-config-default.xml | 55 ------- .../server/core/RecursiveMetadataResourceTest.java | 61 ------- .../apache/tika/server/core/TikaResourceTest.java | 30 ---- .../server/core/benchmark/TikaServerBenchmark.java | 1 - .../standard/RecursiveMetadataResourceTest.java | 183 +++++---------------- .../tika/server/standard/TikaResourceTest.java | 59 ------- 27 files changed, 718 insertions(+), 717 deletions(-)
