This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch spill-scoreboard
in repository https://gitbox.apache.org/repos/asf/tika.git
from eaecd350ac TIKA-4835 -- record per-stage pipes timings (StageTimings,
PIPES_TIMING log) and add a property-gated temp-file spill scoreboard
(SpillStats)
add 7e81c2decb TIKA-4834 allow json config comments (#3065)
add e7708bed38 TIKA-4836: update google oauth, google cloud, aws, oak
add c21e430147 Merge remote-tracking branch 'origin/main' into
spill-scoreboard
No new revisions were added by this update.
Summary of changes:
CHANGES.txt | 7 +++++
tika-parent/pom.xml | 6 ++--
.../org/apache/tika/async/cli/TikaAsyncCLI.java | 4 ++-
.../apache/tika/async/cli/AsyncCliParserTest.java | 17 +++++++++++
.../tika/pipes/core/config/ConfigMerger.java | 6 ++--
.../tika/pipes/core/config/ConfigMergerTest.java | 34 ++++++++++++++++++++++
.../tika-pipes-google-drive/pom.xml | 2 +-
.../server/core/TikaServerIntegrationTest.java | 12 ++++++++
...basic.json => tika-config-server-comments.json} | 14 ++++-----
9 files changed, 85 insertions(+), 17 deletions(-)
copy
tika-server/tika-server-core/src/test/resources/configs/{tika-config-server-basic.json
=> tika-config-server-comments.json} (51%)