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 304224c01adf814050c85fe55831003b197baf65
Author: Tilman Hausherr <[email protected]>
AuthorDate: Mon Oct 21 17:40:37 2024 +0200

    TIKA-4322: add http2 dependencies; add comments for future updates of jetty 
/ solr
---
 tika-parent/pom.xml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 0ddbbf8b9..582e98335 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -341,6 +341,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 -->
     <cxf.version>4.0.5</cxf.version>
     <ddplist.version>1.28</ddplist.version>
     <dl4j.version>1.0.0-M2.1</dl4j.version>
@@ -374,8 +375,12 @@
     <jcommander.version>1.82</jcommander.version>
     <jdom2.version>2.0.6.1</jdom2.version>
     <jempbox.version>1.8.17</jempbox.version>
-    <!-- 12.0.* needs java 17 -->
+    <!-- 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.http2.version>11.0.24</jetty.http2.version>
     <jhighlight.version>1.1.0</jhighlight.version>
     <jna.version>5.15.0</jna.version>
     <json.simple.version>1.1.1</json.simple.version>
@@ -423,6 +428,7 @@
     <slf4j.version>2.0.16</slf4j.version>
     <sis.version>1.4</sis.version>
     <snappy.version>1.1.10.7</snappy.version>
+    <!-- can't update because this requires non trivial changes in 
SolrEmitter.initialize() -->
     <solrj.version>8.11.4</solrj.version>
     <spring.version>6.1.14</spring.version>
     <sqlite.version>3.46.1.3</sqlite.version>
@@ -501,6 +507,27 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- avoid outdated http2 dependencies when using solr 8 -->
+      <dependency>
+          <groupId>org.eclipse.jetty.http2</groupId>
+          <artifactId>http2-http-client-transport</artifactId>
+          <version>${jetty.http2.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.jetty.http2</groupId>
+          <artifactId>http2-hpack</artifactId> 
+          <version>${jetty.http2.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.jetty.http2</groupId>
+          <artifactId>http2-client</artifactId>
+          <version>${jetty.http2.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.eclipse.jetty.http2</groupId>
+          <artifactId>http2-common</artifactId>
+          <version>${jetty.http2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>

Reply via email to