Skip to content

Commit 70e4d78

Browse files
authored
align Jetty to 12.0.36 to match CXF 4.1.7; trim version comments (#2898)
1 parent 979136b commit 70e4d78

1 file changed

Lines changed: 5 additions & 19 deletions

File tree

tika-parent/pom.xml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@
342342
<commons.math3.version>3.6.1</commons.math3.version>
343343
<commons.net.version>3.12.0</commons.net.version>
344344
<ctakes.version>6.0.0</ctakes.version>
345-
<!-- Upgraded to 4.1.7 (from 4.0.11) as part of the Jetty 12 migration (CVE-2026-2332).
346-
CXF 4.1.x ships cxf-rt-transports-http-jetty built against Jetty 12. -->
347345
<cxf.version>4.1.7</cxf.version>
348346
<ddplist.version>1.29</ddplist.version>
349347
<dl4j.version>1.0.0-M2.1</dl4j.version>
@@ -383,14 +381,9 @@
383381
<jcommander.version>1.82</jcommander.version>
384382
<jdom2.version>2.0.6.1</jdom2.version>
385383
<jempbox.version>1.8.17</jempbox.version>
386-
<!-- Upgraded from 11.0.26 to 12.0.35 to fix CVE-2026-2332 (HTTP/1.1 request smuggling,
387-
CVSS 9.1 Critical). Jetty 11.x is EOL and 11.0.28 was never released; the fix
388-
is only available in the Jetty 12 line (>=12.0.33). Jetty 12.0.x requires Java 17,
389-
the same minimum as this project. Migration guide:
390-
https://jetty.org/docs/jetty/12/programming-guide/migration/11-to-12.html
391-
-->
392-
<jetty.version>12.0.35</jetty.version>
393-
<jetty.http2.version>12.0.35</jetty.http2.version>
384+
<!-- pinned to the 12.0.x line CXF and SolrJ build against; 12.0.36 matches CXF's jetty-ee10-servlet -->
385+
<jetty.version>12.0.36</jetty.version>
386+
<jetty.http2.version>12.0.36</jetty.http2.version>
394387
<jhighlight.version>2.0.0</jhighlight.version>
395388
<jna.version>5.19.1</jna.version>
396389
<json.simple.version>1.1.1</json.simple.version>
@@ -438,13 +431,7 @@
438431
<slf4j.version>2.0.18</slf4j.version>
439432
<sis.version>1.6</sis.version>
440433
<snappy.version>1.1.10.8</snappy.version>
441-
<!-- Upgraded to 10.0.0 (from 9.10.1): SolrJ 9.x bundles Jetty 11 HTTP client APIs
442-
internally (Http2SolrClient / solr-solrj-jetty), which conflict with Jetty 12.
443-
SolrJ 10 renames Http2SolrClient -> HttpJettySolrClient (in solr-solrj-jetty)
444-
and LBHttpSolrClient -> LBJettySolrClient; the solr-solrj-jetty artifact must
445-
be added alongside solr-solrj wherever those classes are used.
446-
NOTE: proxy and basic auth are wired via HttpJettySolrClient.Builder;
447-
only basic auth is supported (non-basic schemes are rejected at startup). -->
434+
<!-- SolrJ 10 splits the Jetty client/ZK code into solr-solrj-jetty / solr-solrj-zookeeper -->
448435
<solrj.version>10.0.0</solrj.version>
449436
<spring.version>7.0.8</spring.version>
450437
<sqlite.version>3.53.2.0</sqlite.version>
@@ -572,7 +559,6 @@
572559
<type>pom</type>
573560
<scope>import</scope>
574561
</dependency>
575-
<!-- Jetty 12 renamed all http2 artifacts with a jetty- prefix -->
576562
<dependency>
577563
<groupId>org.eclipse.jetty.http2</groupId>
578564
<artifactId>jetty-http2-client-transport</artifactId>
@@ -1364,7 +1350,7 @@
13641350
<version>3.2.0</version>
13651351
<configuration>
13661352
<excludeCoordinates>
1367-
<!-- [CVE-2025-1948] check if still present in ${jetty.http2.version}; CVE-2026-2332 is fixed. -->
1353+
<!-- [CVE-2025-1948] excluded; re-check whether still present in ${jetty.http2.version} -->
13681354
<coordinate>
13691355
<groupId>org.eclipse.jetty.http2</groupId>
13701356
<artifactId>jetty-http2-common</artifactId>

0 commit comments

Comments
 (0)