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 2026/08/10 16:32:42 UTC

(tika) 03/03: Merge branch 'main' into TIKA-4809-stage-5

This is an automated email from the ASF dual-hosted git repository.

tballison pushed a commit to branch TIKA-4809-stage-5
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 87747b39ec0737355ba65e44041a48a76c3108d1
Merge: 55a0943ac7 dbf709e178
Author: tallison <ta...@apache.org>
AuthorDate: Mon Aug 10 11:59:04 2026 -0400

    Merge branch 'main' into TIKA-4809-stage-5

 .mvn/extensions.xml                                |  2 +-
 .../ROOT/pages/advanced/setting-limits.adoc        | 59 +++++++++++++++++---
 .../ROOT/pages/developers/serialization.adoc       | 20 +++++++
 .../pages/migration-to-4x/design-notes-4x.adoc     |  8 +++
 .../migration-to-4x/migrating-tika-server-4x.adoc  | 63 +++++++++++++++++++++-
 .../ROOT/pages/pipes/plugins/filesystem.adoc       | 11 ++--
 docs/modules/ROOT/pages/pipes/plugins/http.adoc    | 34 +++++++++++-
 docs/modules/ROOT/pages/pipes/timeouts.adoc        |  4 +-
 docs/modules/ROOT/pages/security.adoc              |  5 +-
 .../java/org/apache/tika/config/TimeoutLimits.java | 29 +++++++---
 tika-parent/pom.xml                                | 34 +++++-------
 .../org/apache/tika/parser/vlm/VLMOCRConfig.java   |  2 +-
 .../apache/tika/parser/pdf/AbstractPDF2XHTML.java  |  3 +-
 .../org/apache/tika/config/TimeoutLimitsTest.java  | 11 ++--
 tika-server/README.md                              | 31 ++++++++---
 .../tika/server/core/resource/TikaWelcome.java     | 36 ++++++++++---
 .../tika/server/core/ConfigExamplesTest.java       |  6 +++
 .../resources/config-examples/server-basic.json    |  7 ++-
 .../config-examples/server-with-parsers.json       |  4 +-
 .../resources/configs/cxf-test-base-template.json  |  2 -
 20 files changed, 298 insertions(+), 73 deletions(-)