This is an automated email from the ASF dual-hosted git repository. tilman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
commit 0268c9e0fdd1a018ba5194e33be81b051f52e463 Author: Tilman Hausherr <[email protected]> AuthorDate: Tue Mar 11 14:02:28 2025 +0100 TIKA-4327: revert last commit (fails on CI) --- .../grpc/PipesBiDirectionalStreamingIntegrationTest.java | 5 ++++- tika-parent/pom.xml | 12 ++++++++++-- tika-server/tika-server-core/pom.xml | 5 ----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/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 index c1a46201e..7a3c551f3 100644 --- a/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 @@ -41,6 +41,7 @@ import org.apache.commons.io.FileUtils; import org.awaitility.Awaitility; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ResourceHandler; +import org.eclipse.jetty.util.resource.PathResource; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -93,7 +94,9 @@ class PipesBiDirectionalStreamingIntegrationTest { ResourceHandler resourceHandler = new ResourceHandler(); resourceHandler.setDirAllowed(true); - resourceHandler.setBaseResourceAsString("src/test/resources/test-files"); + // TODO when using jetty 12: + // resourceHandler.setBaseResourceAsString("src/test/resources/test-files") + resourceHandler.setBaseResource(new PathResource(Paths.get("src", "test", "resources", "test-files"))); httpServer.setHandler(resourceHandler); httpServer.start(); diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 298b8918a..70f879440 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -343,7 +343,9 @@ <commons.math3.version>3.6.1</commons.math3.version> <commons.net.version>3.11.1</commons.net.version> <ctakes.version>6.0.0</ctakes.version> - <cxf.version>4.1.1</cxf.version> + <!-- can't use 4.1.0, fails in tika server core because it uses jetty 12, which we can't + use due to the problems explained there --> + <cxf.version>4.0.6</cxf.version> <ddplist.version>1.28</ddplist.version> <dl4j.version>1.0.0-M2.1</dl4j.version> <fakeload.version>0.7.0</fakeload.version> @@ -379,7 +381,13 @@ <jcommander.version>1.82</jcommander.version> <jdom2.version>2.0.6.1</jdom2.version> <jempbox.version>1.8.17</jempbox.version> - <jetty.version>12.0.16</jetty.version> + <!-- can't update to jetty 12 because of problem in solr integration tests + due to Http2SolrClient (solrj 9.7.0) + expecting org.eclipse.jetty.client.util.InputStreamResponseListener + but this class is now in org.eclipse.jetty.client, see also + https://jetty.org/docs/jetty/12/programming-guide/migration/11-to-12.html + when updating, see also TODO in PipesBiDirectionalStreamingIntegrationTest --> + <jetty.version>11.0.24</jetty.version> <jetty.http2.version>11.0.24</jetty.http2.version> <jhighlight.version>1.1.0</jhighlight.version> <jna.version>5.16.0</jna.version> diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml index fe29717f0..13714b6f0 100644 --- a/tika-server/tika-server-core/pom.xml +++ b/tika-server/tika-server-core/pom.xml @@ -130,11 +130,6 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>6.0.0</version> - </dependency> </dependencies> <build>
