This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch tika-grpc-mv-take3 in repository https://gitbox.apache.org/repos/asf/tika.git
commit 2c69e2956ee4eaa0e95992dd84620100a88e8de3 Merge: e5a0265ff 80d4a2600 Author: tallison <[email protected]> AuthorDate: Wed Jul 10 10:11:33 2024 -0400 Merge remote-tracking branch 'origin/TIKA-4181-grpc' # Conflicts: # tika-pipes/tika-grpc/example-dockerfile/Dockerfile # tika-pipes/tika-grpc/example-dockerfile/docker-build.sh tika-pipes/pom.xml | 1 - tika-pipes/tika-grpc/example-dockerfile/Dockerfile | 43 -------------- .../tika-grpc/example-dockerfile/docker-build.sh | 45 -------------- tika-server/pom.xml | 1 + .../tika-server-grpc}/README.md | 0 .../tika-server-grpc}/pom.xml | 66 ++++++++++++++++++++- .../tika/pipes/grpc/ExpiringFetcherStore.java | 0 .../org/apache/tika/pipes/grpc/TikaGrpcServer.java | 21 +++++-- .../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 7 ++- .../grpc/exception/FetcherNotFoundException.java | 0 .../tika-server-grpc}/src/main/proto/tika.proto | 0 .../src/main/resources/log4j2.xml | 0 .../tika/pipes/grpc/ExpiringFetcherStoreTest.java | 0 ...PipesBiDirectionalStreamingIntegrationTest.java | 0 .../apache/tika/pipes/grpc/TikaGrpcServerTest.java | 0 .../src/test/resources/certs/README.md | 0 .../src/test/resources/certs/ca.key | 0 .../src/test/resources/certs/ca.pem | 0 .../src/test/resources/certs/client.key | 0 .../src/test/resources/certs/client.pem | 0 .../src/test/resources/certs/server1.key | 0 .../src/test/resources/certs/server1.pem | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/test-files/014760.docx | Bin .../src/test/resources/test-files/017091.docx | Bin .../src/test/resources/test-files/017097.docx | Bin .../src/test/resources/test-files/018367.docx | Bin .../src/test/resources/tika-pipes-test-config.xml | 0 28 files changed, 86 insertions(+), 98 deletions(-)
