You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2024/12/14 09:09:27 UTC
(tika) branch main updated (5efd04e64 -> ee900c397)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from 5efd04e64 TIKA-4327: update puppycrawl, aws, google cloud, spring
new 77aee5429 TIKA-4327: must use jetty 12 API
new ee900c397 TIKA-4327: update cxf, jetty
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java | 5 +----
tika-parent/pom.xml | 10 ++--------
2 files changed, 3 insertions(+), 12 deletions(-)
(tika) 01/02: TIKA-4327: must use jetty 12 API
Posted by ti...@apache.org.
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 77aee54297a2cac62c50bcc4aeb88bd7c7a77a20
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Dec 14 10:07:16 2024 +0100
TIKA-4327: must use jetty 12 API
---
.../tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java | 5 +----
1 file changed, 1 insertion(+), 4 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();
(tika) 02/02: TIKA-4327: update cxf, jetty
Posted by ti...@apache.org.
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 ee900c39710d97fa5530f6ddc5aae18aeaa7a419
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Dec 14 10:09:14 2024 +0100
TIKA-4327: update cxf, jetty
---
tika-parent/pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index f0ee49857..83dabfda4 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -342,9 +342,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>
- <!-- TODO when 4.1.0 comes out, try updating jetty to 12 -->
- <!-- needs change in PipesBiDirectionalStreamingIntegrationTest.java -->
- <cxf.version>4.0.6</cxf.version>
+ <cxf.version>4.1.0</cxf.version>
<ddplist.version>1.28</ddplist.version>
<dl4j.version>1.0.0-M2.1</dl4j.version>
<fakeload.version>0.7.0</fakeload.version>
@@ -380,11 +378,7 @@
<jcommander.version>1.82</jcommander.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jempbox.version>1.8.17</jempbox.version>
- <!-- 12.0.* needs cxf 4.1.0, see https://issues.apache.org/jira/browse/CXF-9034 ,
- or it will fail in tika-server-core with
- IllegalAccessError: class org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine tried to access protected method 'void org.eclipse.jetty.server.Handler$AbstractContainer.<init>()'
- -->
- <jetty.version>11.0.24</jetty.version>
+ <jetty.version>12.0.15</jetty.version>
<jetty.http2.version>11.0.24</jetty.http2.version>
<jhighlight.version>1.1.0</jhighlight.version>
<jna.version>5.15.0</jna.version>