From f7cac0ecfe2c83557e1612583bbe517e0af4e4e1 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Thu, 2 Jul 2026 18:07:03 +0000 Subject: [PATCH] Update Web server stack to v4 (branch_9x) --- versions.lock | 69 +++++++++++++++++++++++++------------------------- versions.props | 8 +++--- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/versions.lock b/versions.lock index 0b82e9481ea..a7cd33afa3b 100644 --- a/versions.lock +++ b/versions.lock @@ -166,10 +166,12 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0) io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b) io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9) io.swagger.core.v3:swagger-annotations-jakarta:2.2.52 (1 constraints: 3d053d3b) -jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) -jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e) -jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954) +jakarta.activation:jakarta.activation-api:2.1.3 (2 constraints: cf1f6b1a) +jakarta.annotation:jakarta.annotation-api:3.0.0 (5 constraints: 0351530b) +jakarta.inject:jakarta.inject-api:2.0.1 (6 constraints: 1b621332) +jakarta.validation:jakarta.validation-api:3.1.0 (1 constraints: fd10bcc3) +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0 (6 constraints: 6e651751) +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 (2 constraints: fd1d3f69) junit:junit:4.13.2 (7 constraints: 736dcb65) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf) @@ -277,41 +279,41 @@ org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319) org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a) org.codehaus.woodstox:stax2-api:4.3.0 (4 constraints: 5d338b6e) org.conscrypt:conscrypt-openjdk-uber:2.5.2 (3 constraints: 193286c8) -org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161) -org.eclipse.jetty:jetty-alpn-java-client:10.0.26 (2 constraints: 231b156f) -org.eclipse.jetty:jetty-alpn-java-server:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty:jetty-alpn-server:10.0.26 (2 constraints: f9167b49) -org.eclipse.jetty:jetty-client:10.0.26 (2 constraints: 231b156f) -org.eclipse.jetty:jetty-deploy:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty:jetty-http:10.0.26 (6 constraints: 824ff191) -org.eclipse.jetty:jetty-io:10.0.26 (9 constraints: c77dd1ef) -org.eclipse.jetty:jetty-jmx:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty:jetty-rewrite:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty:jetty-security:10.0.26 (2 constraints: c0137579) -org.eclipse.jetty:jetty-server:10.0.26 (7 constraints: ea6da02c) +org.eclipse.jetty:jetty-alpn-client:12.0.27 (3 constraints: fd2ee062) +org.eclipse.jetty:jetty-alpn-java-client:12.0.27 (2 constraints: 231b156f) +org.eclipse.jetty:jetty-alpn-java-server:12.0.27 (1 constraints: 6b059440) +org.eclipse.jetty:jetty-alpn-server:12.0.27 (2 constraints: fc168849) +org.eclipse.jetty:jetty-client:12.0.27 (2 constraints: 231b156f) +org.eclipse.jetty:jetty-deploy:12.0.27 (1 constraints: 6b059440) +org.eclipse.jetty:jetty-http:12.0.27 (6 constraints: 884f9c94) +org.eclipse.jetty:jetty-io:12.0.27 (9 constraints: d67d23fa) +org.eclipse.jetty:jetty-jmx:12.0.27 (1 constraints: 6b059440) +org.eclipse.jetty:jetty-rewrite:12.0.27 (1 constraints: 6b059440) +org.eclipse.jetty:jetty-security:12.0.27 (3 constraints: 272d65a8) +org.eclipse.jetty:jetty-server:12.0.27 (8 constraints: bd799096) org.eclipse.jetty:jetty-servlet:10.0.26 (2 constraints: 3a139f61) org.eclipse.jetty:jetty-servlets:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty:jetty-util:10.0.26 (9 constraints: c181ff9f) -org.eclipse.jetty:jetty-webapp:10.0.26 (2 constraints: 48132762) -org.eclipse.jetty:jetty-xml:10.0.26 (3 constraints: 1721b5bb) +org.eclipse.jetty:jetty-util:12.0.27 (8 constraints: 5066015d) +org.eclipse.jetty:jetty-webapp:10.0.26 (1 constraints: 6b059440) +org.eclipse.jetty:jetty-xml:12.0.27 (3 constraints: 1a213dbc) org.eclipse.jetty.http2:http2-client:10.0.26 (2 constraints: 231b156f) org.eclipse.jetty.http2:http2-common:10.0.26 (3 constraints: e5240563) org.eclipse.jetty.http2:http2-hpack:10.0.26 (2 constraints: 2615cce0) org.eclipse.jetty.http2:http2-http-client-transport:10.0.26 (1 constraints: 6b059440) org.eclipse.jetty.http2:http2-server:10.0.26 (1 constraints: 6b059440) -org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9 (4 constraints: 8b30cdc0) -org.glassfish.hk2:hk2-api:3.1.1 (2 constraints: 70114901) -org.glassfish.hk2:hk2-locator:3.1.1 (1 constraints: 4410d8ad) -org.glassfish.hk2:hk2-utils:3.1.1 (2 constraints: 19178676) -org.glassfish.hk2:osgi-resource-locator:1.0.4 (1 constraints: ef10e7c2) -org.glassfish.hk2.external:aopalliance-repackaged:3.1.1 (2 constraints: 19178676) -org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1 (1 constraints: 4105533b) -org.glassfish.jersey.core:jersey-client:3.1.12 (1 constraints: 3011edd4) -org.glassfish.jersey.core:jersey-common:3.1.12 (6 constraints: 1667aa5c) -org.glassfish.jersey.core:jersey-server:3.1.12 (2 constraints: 731e8152) -org.glassfish.jersey.ext:jersey-entity-filtering:3.1.12 (1 constraints: ed1510e9) -org.glassfish.jersey.inject:jersey-hk2:3.1.12 (1 constraints: 3905373b) -org.glassfish.jersey.media:jersey-media-json-jackson:3.1.12 (1 constraints: 3905373b) +org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9 (2 constraints: 1015d6be) +org.glassfish.hk2:hk2-api:4.0.1 (2 constraints: 70114d01) +org.glassfish.hk2:hk2-locator:4.0.1 (1 constraints: ec10e8df) +org.glassfish.hk2:hk2-utils:4.0.1 (2 constraints: 19178a76) +org.glassfish.hk2:osgi-resource-locator:3.0.0 (1 constraints: ee10eec2) +org.glassfish.hk2.external:aopalliance-repackaged:4.0.1 (2 constraints: 19178a76) +org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2 (1 constraints: 08050136) +org.glassfish.jersey.core:jersey-client:4.0.2 (1 constraints: ff10c0c3) +org.glassfish.jersey.core:jersey-common:4.0.2 (6 constraints: e865aa70) +org.glassfish.jersey.core:jersey-server:4.0.2 (2 constraints: 091ec321) +org.glassfish.jersey.ext:jersey-entity-filtering:4.0.2 (1 constraints: bc1526d3) +org.glassfish.jersey.inject:jersey-hk2:4.0.2 (1 constraints: 08050136) +org.glassfish.jersey.media:jersey-media-json-jackson:4.0.2 (1 constraints: 08050136) org.hamcrest:hamcrest:3.0 (3 constraints: 74208125) org.hamcrest:hamcrest-core:3.0 (1 constraints: cc05fe3f) org.immutables:value-annotations:2.12.2 (1 constraints: 3905373b) @@ -346,7 +348,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3d05333b) org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f) -org.slf4j:slf4j-api:2.0.18 (70 constraints: 02f2946d) +org.slf4j:slf4j-api:2.0.18 (71 constraints: 7e0b2ddc) org.threeten:threetenbp:1.7.0 (6 constraints: 32557c53) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.46.18 (31 constraints: 05dc83d0) @@ -412,7 +414,6 @@ io.micrometer:micrometer-core:1.9.12 (1 constraints: fe162919) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9) jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (1 constraints: bd0db535) javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) net.bytebuddy:byte-buddy:1.18.10 (2 constraints: b61064d7) diff --git a/versions.props b/versions.props index 9227f6fec1e..df7d1481153 100644 --- a/versions.props +++ b/versions.props @@ -35,7 +35,7 @@ io.opentracing:opentracing*=0.33.0 io.prometheus:prometheus*=1.8.0 io.prometheus:simpleclient*=0.16.0 io.swagger.core.v3:*=2.2.52 -jakarta.ws.rs:jakarta.ws.rs-api=3.1.0 +jakarta.ws.rs:jakarta.ws.rs-api=4.0.0 junit:junit=4.13.2 net.bytebuddy:*=1.18.10 net.java.dev.jna:jna=5.18.1 @@ -71,11 +71,11 @@ org.carrot2:carrot2-core=4.5.1 org.codehaus.woodstox:stax2-api=4.3.0 org.eclipse.jetty*:*=10.0.26 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.9 -org.glassfish.hk2*:*=3.1.1 +org.glassfish.hk2*:*=4.0.1 org.glassfish.hk2.external:jakarta.inject=2.6.1 org.glassfish.hk2:osgi*=1.0.4 -org.glassfish.jersey*:*=3.1.12 -org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1 +org.glassfish.jersey*:*=4.0.2 +org.glassfish.jersey.containers:jersey-container-jetty-http=4.0.2 org.hamcrest:*=3.0 org.hsqldb:hsqldb=2.7.4 org.immutables:value-annotations=2.12.2