This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch mv-tika-grpc-to-main-level in repository https://gitbox.apache.org/repos/asf/tika.git
commit 63e1d1a5576446f351f8af5824a8c798542e59be Author: tallison <[email protected]> AuthorDate: Tue Jul 9 17:26:52 2024 -0400 TIKA-4275 -- move grpc server out of tika-pipes --- pom.xml | 1 + {tika-pipes/tika-grpc => tika-grpc}/README.md | 0 .../tika-grpc => tika-grpc}/example-dockerfile/Dockerfile | 0 .../example-dockerfile/docker-build.sh | 0 {tika-pipes/tika-grpc => tika-grpc}/pom.xml | 5 ++--- .../org/apache/tika/pipes/grpc/ExpiringFetcherStore.java | 0 .../java/org/apache/tika/pipes/grpc/TikaGrpcServer.java | 0 .../java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 0 .../tika/pipes/grpc/exception/FetcherNotFoundException.java | 0 .../tika-grpc => tika-grpc}/src/main/proto/tika.proto | 0 .../tika-grpc => tika-grpc}/src/main/resources/log4j2.xml | 0 .../apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java | 0 .../grpc/PipesBiDirectionalStreamingIntegrationTest.java | 0 .../java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java | 0 .../src/test/resources/certs/README.md | 0 .../tika-grpc => tika-grpc}/src/test/resources/certs/ca.key | 0 .../tika-grpc => tika-grpc}/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 .../tika-grpc => tika-grpc}/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 tika-pipes/pom.xml | 1 - 28 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dd5706296..da70a9fc6 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,7 @@ <module>tika-pipes</module> <module>tika-app</module> <module>tika-server</module> + <module>tika-grpc</module> <module>tika-integration-tests</module> <module>tika-eval</module> <module>tika-fuzzing</module> diff --git a/tika-pipes/tika-grpc/README.md b/tika-grpc/README.md similarity index 100% rename from tika-pipes/tika-grpc/README.md rename to tika-grpc/README.md diff --git a/tika-pipes/tika-grpc/example-dockerfile/Dockerfile b/tika-grpc/example-dockerfile/Dockerfile similarity index 100% rename from tika-pipes/tika-grpc/example-dockerfile/Dockerfile rename to tika-grpc/example-dockerfile/Dockerfile diff --git a/tika-pipes/tika-grpc/example-dockerfile/docker-build.sh b/tika-grpc/example-dockerfile/docker-build.sh similarity index 100% rename from tika-pipes/tika-grpc/example-dockerfile/docker-build.sh rename to tika-grpc/example-dockerfile/docker-build.sh diff --git a/tika-pipes/tika-grpc/pom.xml b/tika-grpc/pom.xml similarity index 99% rename from tika-pipes/tika-grpc/pom.xml rename to tika-grpc/pom.xml index a401c6033..c14d056c9 100644 --- a/tika-pipes/tika-grpc/pom.xml +++ b/tika-grpc/pom.xml @@ -26,12 +26,11 @@ for safely updating the version in our release process. --> <name>Apache Tika pipes gRPC server</name> <url>https://tika.apache.org/</url> - <parent> <groupId>org.apache.tika</groupId> - <artifactId>tika-pipes</artifactId> + <artifactId>tika-parent</artifactId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../tika-parent/pom.xml</relativePath> </parent> <properties> diff --git a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java similarity index 100% rename from tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java diff --git a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java similarity index 100% rename from tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java diff --git a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java similarity index 100% rename from tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java diff --git a/tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java similarity index 100% rename from tika-pipes/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java diff --git a/tika-pipes/tika-grpc/src/main/proto/tika.proto b/tika-grpc/src/main/proto/tika.proto similarity index 100% rename from tika-pipes/tika-grpc/src/main/proto/tika.proto rename to tika-grpc/src/main/proto/tika.proto diff --git a/tika-pipes/tika-grpc/src/main/resources/log4j2.xml b/tika-grpc/src/main/resources/log4j2.xml similarity index 100% rename from tika-pipes/tika-grpc/src/main/resources/log4j2.xml rename to tika-grpc/src/main/resources/log4j2.xml diff --git a/tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java similarity index 100% rename from tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java diff --git a/tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java similarity index 100% rename from tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java diff --git a/tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java similarity index 100% rename from tika-pipes/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/README.md b/tika-grpc/src/test/resources/certs/README.md similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/README.md rename to tika-grpc/src/test/resources/certs/README.md diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/ca.key b/tika-grpc/src/test/resources/certs/ca.key similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/ca.key rename to tika-grpc/src/test/resources/certs/ca.key diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/ca.pem b/tika-grpc/src/test/resources/certs/ca.pem similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/ca.pem rename to tika-grpc/src/test/resources/certs/ca.pem diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/client.key b/tika-grpc/src/test/resources/certs/client.key similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/client.key rename to tika-grpc/src/test/resources/certs/client.key diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/client.pem b/tika-grpc/src/test/resources/certs/client.pem similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/client.pem rename to tika-grpc/src/test/resources/certs/client.pem diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/server1.key b/tika-grpc/src/test/resources/certs/server1.key similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/server1.key rename to tika-grpc/src/test/resources/certs/server1.key diff --git a/tika-pipes/tika-grpc/src/test/resources/certs/server1.pem b/tika-grpc/src/test/resources/certs/server1.pem similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/certs/server1.pem rename to tika-grpc/src/test/resources/certs/server1.pem diff --git a/tika-pipes/tika-grpc/src/test/resources/log4j2.xml b/tika-grpc/src/test/resources/log4j2.xml similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/log4j2.xml rename to tika-grpc/src/test/resources/log4j2.xml diff --git a/tika-pipes/tika-grpc/src/test/resources/test-files/014760.docx b/tika-grpc/src/test/resources/test-files/014760.docx similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/test-files/014760.docx rename to tika-grpc/src/test/resources/test-files/014760.docx diff --git a/tika-pipes/tika-grpc/src/test/resources/test-files/017091.docx b/tika-grpc/src/test/resources/test-files/017091.docx similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/test-files/017091.docx rename to tika-grpc/src/test/resources/test-files/017091.docx diff --git a/tika-pipes/tika-grpc/src/test/resources/test-files/017097.docx b/tika-grpc/src/test/resources/test-files/017097.docx similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/test-files/017097.docx rename to tika-grpc/src/test/resources/test-files/017097.docx diff --git a/tika-pipes/tika-grpc/src/test/resources/test-files/018367.docx b/tika-grpc/src/test/resources/test-files/018367.docx similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/test-files/018367.docx rename to tika-grpc/src/test/resources/test-files/018367.docx diff --git a/tika-pipes/tika-grpc/src/test/resources/tika-pipes-test-config.xml b/tika-grpc/src/test/resources/tika-pipes-test-config.xml similarity index 100% rename from tika-pipes/tika-grpc/src/test/resources/tika-pipes-test-config.xml rename to tika-grpc/src/test/resources/tika-pipes-test-config.xml diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml index d1de647b3..576493c06 100644 --- a/tika-pipes/pom.xml +++ b/tika-pipes/pom.xml @@ -36,7 +36,6 @@ <module>tika-pipes-iterators</module> <module>tika-pipes-reporters</module> <module>tika-async-cli</module> - <module>tika-grpc</module> </modules> <dependencies> <dependency>
