This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/4.1.x-fixes by this push:
new 467b04924cb Update Jetty to 12.0.36
467b04924cb is described below
commit 467b04924cb534cfccf586576db79f42b6dd6c4d
Author: Andriy Redko <[email protected]>
AuthorDate: Wed Jun 3 18:14:36 2026 -0400
Update Jetty to 12.0.36
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java | 3 ++-
.../systest/http2_jetty/AbstractJettyClientServerHttp2Test.java | 7 ++++---
.../java/org/apache/cxf/systest/http2_jetty/Http2TestClient.java | 6 ++++--
.../apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java | 5 +++++
.../cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java | 5 +++++
7 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 6fed91edd4c..3879382bdc2 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.spring.boot.version>3.4.13</cxf.spring.boot.version>
<cxf.spring.cloud.eureka.version>4.2.3</cxf.spring.cloud.eureka.version>
- <cxf.jetty12.version>12.0.34</cxf.jetty12.version>
+ <cxf.jetty12.version>12.0.36</cxf.jetty12.version>
<cxf.netty.version>4.1.135.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.32.5</cxf.swagger.ui.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6452e697e1d..5869a6e818e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,7 +161,7 @@
<cxf.jcache.version>1.1.1</cxf.jcache.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.5.5</cxf.jettison.version>
- <cxf.jetty12.version>12.0.34</cxf.jetty12.version>
+ <cxf.jetty12.version>12.0.36</cxf.jetty12.version>
<cxf.jetty.version>${cxf.jetty12.version}</cxf.jetty.version>
<cxf.jexl.version>3.3</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java
index 725318db4af..b7602f05a60 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java
@@ -59,7 +59,8 @@ public class DigestAuthSupplierJettyTest extends
AbstractClientServerTestBase {
@Test
public void test() {
- WebClient client = WebClient.create("http://localhost:"; +
DigestAuthSupplierJettyServer.PORT, (String) null);
+ final WebClient client = WebClient
+ .create("http://localhost:"; + DigestAuthSupplierJettyServer.PORT +
"/", (String) null);
assertThrows(NotAuthorizedException.class, () ->
client.get(String.class));
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/AbstractJettyClientServerHttp2Test.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/AbstractJettyClientServerHttp2Test.java
index 98fa6c4f25a..a08edbbd45d 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/AbstractJettyClientServerHttp2Test.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/AbstractJettyClientServerHttp2Test.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
abstract class AbstractJettyClientServerHttp2Test extends
AbstractBusClientServerTestBase {
@Test
public void testBookNotFoundWithHttp2() throws Exception {
- final Http2TestClient client = new Http2TestClient(isSecure());
+ final Http2TestClient client = new Http2TestClient(isSecure(),
getPort());
final ClientResponse response = client
.request(getAddress())
@@ -53,7 +53,7 @@ abstract class AbstractJettyClientServerHttp2Test extends
AbstractBusClientServe
@Test
public void testBookWithHttp2() throws Exception {
- final Http2TestClient client = new Http2TestClient(isSecure());
+ final Http2TestClient client = new Http2TestClient(isSecure(),
getPort());
final ClientResponse response = client
.request(getAddress())
@@ -69,7 +69,7 @@ abstract class AbstractJettyClientServerHttp2Test extends
AbstractBusClientServe
@Test
public void testGetBookStreamHttp2() throws Exception {
- final Http2TestClient client = new Http2TestClient(isSecure());
+ final Http2TestClient client = new Http2TestClient(isSecure(),
getPort());
final ClientResponse response = client
.request(getAddress())
@@ -142,6 +142,7 @@ abstract class AbstractJettyClientServerHttp2Test extends
AbstractBusClientServe
protected abstract String getAddress();
protected abstract String getContext();
+ protected abstract int getPort();
protected boolean isSecure() {
return getAddress().startsWith("https");
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/Http2TestClient.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/Http2TestClient.java
index d657b6b5442..40bb2261658 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/Http2TestClient.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/Http2TestClient.java
@@ -50,8 +50,9 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
public class Http2TestClient implements AutoCloseable {
private final HTTP2Client client;
private final SslContextFactory.Client sslContextFactory;
+ private final int port;
- public Http2TestClient(boolean secure) throws Exception {
+ public Http2TestClient(boolean secure, int port) throws Exception {
client = new HTTP2Client();
if (secure) {
sslContextFactory = new SslContextFactory.Client(true);
@@ -60,6 +61,7 @@ public class Http2TestClient implements AutoCloseable {
sslContextFactory = null;
}
client.start();
+ this.port = port;
}
public static class ClientResponse {
@@ -140,7 +142,7 @@ public class Http2TestClient implements AutoCloseable {
final HttpFields.Mutable requestFields = HttpFields.build();
requestFields.add(HttpHeader.ACCEPT, accept);
- requestFields.add(HttpHeader.HOST, "localhost");
+ requestFields.add(HttpHeader.HOST, "localhost:" + port);
final MetaData.Request request = new MetaData.Request(method,
HttpURI.build(address + path),
version, requestFields);
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java
index a7070247ce2..5790fa08699 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java
@@ -45,4 +45,9 @@ public class JettyClientServerHttp2Test extends
AbstractJettyClientServerHttp2Te
protected String getContext() {
return "/http2";
}
+
+ @Override
+ protected int getPort() {
+ return Integer.valueOf(PORT);
+ }
}
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java
index 805367c2099..5ecf8302ade 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java
@@ -44,4 +44,9 @@ public class JettyClientServerHttp2cTest extends
AbstractJettyClientServerHttp2T
protected String getContext() {
return "/http2";
}
+
+ @Override
+ protected int getPort() {
+ return Integer.valueOf(PORT);
+ }
}
