This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4560
in repository https://gitbox.apache.org/repos/asf/tika.git
from 532ddbc4c merge conflicts
add 9e515ff2b TIKA-4559 -- refactor fetchers and emitters json to key on
id, not type (#2428)
add 6aca7d1c8 Merge branch 'main' into TIKA-4560
No new revisions were added by this update.
Summary of changes:
.../resources/configs/config-fetch-emit-only.json | 10 ++--
.../test/resources/configs/config-template.json | 8 +--
.../src/test/resources/kafka/plugins-template.json | 8 +--
.../resources/opensearch/plugins-template.json | 8 +--
.../opensearch/tika-config-opensearch.json | 8 +--
.../src/test/resources/s3/plugins-template.json | 8 +--
.../src/test/resources/solr/plugins-template.json | 8 +--
.../src/test/resources/tika-config-solr-urls.json | 12 ++---
.../src/main/resources/config-template.json | 8 +--
.../test/resources/configs/config-template.json | 18 ++++---
.../tika/pipes/core/AbstractComponentManager.java | 63 ++++++++++++++--------
.../pipes/core/emitter/EmitterManagerTest.java | 34 +++++++-----
.../pipes/core/fetcher/FetcherManagerTest.java | 34 +++++++-----
.../resources/configs/tika-config-bad-class.json | 4 +-
.../configs/tika-config-bad-java-path.json | 4 +-
.../configs/tika-config-bad-jvm-args.json | 4 +-
.../test/resources/configs/tika-config-basic.json | 8 +--
.../configs/tika-config-crashing-detector.json | 8 +--
.../resources/configs/tika-config-emit-all.json | 8 +--
.../resources/configs/tika-config-passback.json | 8 +--
.../configs/tika-config-timeout-lt-heartbeat.json | 13 +++--
.../resources/configs/tika-config-truncate.json | 8 +--
.../test/resources/configs/tika-config-http.json | 4 +-
.../resources/configs/cxf-test-base-template.json | 14 ++---
.../tika-config-server-fetchers-emitters.json | 8 +--
.../resources/configs/tika-config-server-tls.json | 8 +--
.../test/resources/configs/tika-config-server.json | 8 +--
.../test/resources/configs/tika-pipes-config.json | 8 +--
.../resources/configs/cxf-test-base-template.json | 14 ++---
29 files changed, 200 insertions(+), 156 deletions(-)
