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 ffdb7dce1 TIKA-4560 - checkstyle
     add fb9717f06 TIKA-4561 -- remove tikaconfigpath from pipesconfig (#2430)
     add dc047ee12 Merge branch 'main' into TIKA-4560
     add 532ddbc4c merge conflicts

No new revisions were added by this update.

Summary of changes:
 .../apache/tika/pipes/grpc/TikaGrpcServerImpl.java |  2 +-
 .../tika/async/cli/TikaConfigAsyncWriterTest.java  |  2 +-
 .../org/apache/tika/pipes/core/PipesClient.java    |  6 ++-
 .../org/apache/tika/pipes/core/PipesConfig.java    | 19 +-------
 .../org/apache/tika/pipes/core/PipesParser.java    |  7 ++-
 .../tika/pipes/core/async/AsyncProcessor.java      | 17 ++++---
 .../apache/tika/pipes/core/server/PipesServer.java |  2 +-
 .../apache/tika/pipes/core/PassbackFilterTest.java |  4 +-
 .../apache/tika/pipes/core/PipesClientTest.java    | 52 +++++++++++-----------
 .../apache/tika/pipes/core/PipesServerTest.java    |  2 +-
 .../tika/server/core/resource/PipesResource.java   |  6 +--
 11 files changed, 53 insertions(+), 66 deletions(-)

Reply via email to