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 <[email protected]>
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>

Reply via email to