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
The following commit(s) were added to refs/heads/main by this push:
new 868c29aad TIKA-4327: update cxf, jetty; include jakarta
868c29aad is described below
commit 868c29aad4215f5a865c79eb693ffa2882eb0611
Author: Tilman Hausherr <[email protected]>
AuthorDate: Tue Mar 11 12:56:36 2025 +0100
TIKA-4327: update cxf, jetty; include jakarta
---
.../grpc/PipesBiDirectionalStreamingIntegrationTest.java | 5 +----
tika-parent/pom.xml | 12 ++----------
tika-server/tika-server-core/pom.xml | 5 +++++
3 files changed, 8 insertions(+), 14 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 7a3c551f3..c1a46201e 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,7 +41,6 @@ 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;
@@ -94,9 +93,7 @@ class PipesBiDirectionalStreamingIntegrationTest {
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setDirAllowed(true);
- // TODO when using jetty 12:
- //
resourceHandler.setBaseResourceAsString("src/test/resources/test-files")
- resourceHandler.setBaseResource(new PathResource(Paths.get("src",
"test", "resources", "test-files")));
+
resourceHandler.setBaseResourceAsString("src/test/resources/test-files");
httpServer.setHandler(resourceHandler);
httpServer.start();
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 70f879440..298b8918a 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -343,9 +343,7 @@
<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>
- <!-- 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>
+ <cxf.version>4.1.1</cxf.version>
<ddplist.version>1.28</ddplist.version>
<dl4j.version>1.0.0-M2.1</dl4j.version>
<fakeload.version>0.7.0</fakeload.version>
@@ -381,13 +379,7 @@
<jcommander.version>1.82</jcommander.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jempbox.version>1.8.17</jempbox.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.version>12.0.16</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 13714b6f0..fe29717f0 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -130,6 +130,11 @@
<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>
