Upgraded Jetty library to version 12.1.14. Issue #1515.

changes.md

@@ -2,6 +2,8 @@ Changes log
 ===========
 
 - 2.7.1 (??-??-2026)
+  - Misc
+    - Upgraded Jetty library to version 12.1.14. Issue #1515.
   - Bugs fixed
     - Slf4j bridge reports wrong line number and caller class in log4j. Issue #233.
     - When GET is an allowed method of a server resource, HEAD is now also listed (e.g. in the Allow header of a 405 response). Issue #266.

org.restlet/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>jetty-quic-server</artifactId>
             <version>${lib-jetty-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.quic</groupId>
+            <artifactId>jetty-quic-quiche-server</artifactId>
+            <version>${lib-jetty-version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
@@ -95,6 +100,11 @@
             <artifactId>jetty-quic-client</artifactId>
             <version>${lib-jetty-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.quic</groupId>
+            <artifactId>jetty-quic-quiche-client</artifactId>
+            <version>${lib-jetty-version}</version>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

org.restlet/src/main/java/org/restlet/engine/connector/HttpClientHelper.java

@@ -30,11 +30,13 @@
 import org.eclipse.jetty.http2.client.transport.ClientConnectionFactoryOverHTTP2;
 import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
 import org.eclipse.jetty.http3.client.HTTP3Client;
+import org.eclipse.jetty.http3.client.HTTP3ClientQuicConfiguration;
 import org.eclipse.jetty.http3.client.transport.ClientConnectionFactoryOverHTTP3;
 import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 import org.eclipse.jetty.io.ClientConnector;
-import org.eclipse.jetty.quic.client.ClientQuicConfiguration;
+import org.eclipse.jetty.quic.quiche.client.QuicheClientQuicConfiguration;
+import org.eclipse.jetty.quic.quiche.client.QuicheTransport;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
@@ -236,8 +238,9 @@ public HttpClientHelper(Client client) {
         getProtocols().add(Protocol.HTTP);
         getProtocols().add(Protocol.HTTPS);
         this.authenticationStore = null;
-        this.cookieStore =
-                isCookieSupported() ? new HttpCookieStore.Default() : new HttpCookieStore.Empty();
+        this.cookieStore = isCookieSupported()
+                ? new HttpCookieStore.Default()
+                : new HttpCookieStore.Empty();
         this.executor = null;
     }
 
@@ -248,15 +251,10 @@ public HttpClientHelper(Client client) {
      * @return A low-level HTTP client call.
      */
     public ClientCall create(Request request) {
-        ClientCall result = null;
-
-        result =
-                new JettyClientCall(
+        return new JettyClientCall(
                         this,
                         request.getMethod().toString(),
                         ReferenceUtils.update(request.getResourceRef(), request).toString());
-
-        return result;
     }
 
     /**
@@ -280,8 +278,8 @@ protected HttpClient createHttpClient() {
                 switch (httpTransportProtocol) {
                     case HTTP1_1 -> getHttpTransportForHttp11();
                     case HTTP2 -> getHttpClientTransportForHttp2();
-                    case HTTP3 -> getHttpClientTransportForHttp3(sslContextFactory);
-                    case DYNAMIC -> getHttpClientTransportForDynamicMode(sslContextFactory);
+                    case HTTP3 -> getHttpClientTransportForHttp3();
+                    case DYNAMIC -> getHttpClientTransportForDynamicMode();
                 };
 
         final HttpClient result = new HttpClient(httpTransport);
@@ -347,37 +345,40 @@ private static HttpClientTransportOverHTTP getHttpTransportForHttp11() {
 
     private HttpClientTransport getHttpClientTransportForHttp2() {
         HTTP2Client http2Client = new HTTP2Client();
-        HttpClientTransportOverHTTP2 http2Transport = new HttpClientTransportOverHTTP2(http2Client);
-        http2Transport.setUseALPN(true);
+        http2Client.setUseALPN(true);
 
-        return http2Transport;
+        return new HttpClientTransportOverHTTP2(http2Client);
     }
 
-    private HttpClientTransport getHttpClientTransportForHttp3(
-            SslContextFactory.Client sslContextFactory) {
-        Path pemWorkDirectory = getHttp3PemWorkDirectoryPath();
-        ClientQuicConfiguration quicConfiguration =
-                new ClientQuicConfiguration(sslContextFactory, pemWorkDirectory);
+    private HttpClientTransport getHttpClientTransportForHttp3() {
+        QuicheClientQuicConfiguration quicConfiguration = createQuicConfiguration();
         HTTP3Client http3Client = new HTTP3Client(quicConfiguration);
-        http3Client.getQuicConfiguration().setSessionRecvWindow(64 * 1024 * 1024);
 
-        return new HttpClientTransportOverHTTP3(http3Client);
+        return new HttpClientTransportOverHTTP3(
+                http3Client, new QuicheTransport(quicConfiguration));
+    }
+
+    private QuicheClientQuicConfiguration createQuicConfiguration() {
+        QuicheClientQuicConfiguration quicConfiguration =
+                HTTP3ClientQuicConfiguration.configure(
+                        new QuicheClientQuicConfiguration(getHttp3PemWorkDirectoryPath()));
+        quicConfiguration.setSessionMaxData(64 * 1024L * 1024L);
+        return quicConfiguration;
     }
 
-    private HttpClientTransport getHttpClientTransportForDynamicMode(
-            SslContextFactory.Client sslContextFactory) {
+    private HttpClientTransport getHttpClientTransportForDynamicMode() {
 
         ClientConnectionFactory.Info http1 = HttpClientConnectionFactory.HTTP11;
 
         HTTP2Client http2Client = new HTTP2Client();
         ClientConnectionFactoryOverHTTP2.HTTP2 http2 =
                 new ClientConnectionFactoryOverHTTP2.HTTP2(http2Client);
 
-        ClientQuicConfiguration quicConfiguration =
-                new ClientQuicConfiguration(sslContextFactory, getHttp3PemWorkDirectoryPath());
+        QuicheClientQuicConfiguration quicConfiguration = createQuicConfiguration();
         HTTP3Client http3Client = new HTTP3Client(quicConfiguration);
         ClientConnectionFactoryOverHTTP3.HTTP3 http3 =
-                new ClientConnectionFactoryOverHTTP3.HTTP3(http3Client);
+                new ClientConnectionFactoryOverHTTP3.HTTP3(
+                        http3Client, new QuicheTransport(quicConfiguration));
 
         return new HttpClientTransportDynamic(new ClientConnector(), http1, http2, http3);
     }

org.restlet/src/main/java/org/restlet/engine/connector/HttpsServerHelper.java

@@ -17,8 +17,9 @@
 import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
 import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
 import org.eclipse.jetty.http3.server.HTTP3ServerConnectionFactory;
-import org.eclipse.jetty.quic.server.QuicServerConnector;
-import org.eclipse.jetty.quic.server.ServerQuicConfiguration;
+import org.eclipse.jetty.http3.server.HTTP3ServerQuicConfiguration;
+import org.eclipse.jetty.quic.quiche.server.QuicheServerConnector;
+import org.eclipse.jetty.quic.quiche.server.QuicheServerQuicConfiguration;
 import org.eclipse.jetty.server.AbstractConnectionFactory;
 import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.Connector;
@@ -97,9 +98,8 @@ protected List<Connector> createConnectors(org.eclipse.jetty.server.Server serve
             ServerConnector connector = createServerConnector(server, configuration);
             result.add(connector);
         } else if (httpTransportProtocols.contains(HttpTransportProtocol.HTTP3)) {
-            ServerQuicConfiguration configuration =
-                    createQuicConfiguration(getQuicServerSslContextFactory());
-            QuicServerConnector connector = createQuicServerConnector(server, configuration);
+            QuicheServerConnector connector =
+                    createQuicServerConnector(server, createHttpConfiguration());
             result.add(connector);
         }
 
@@ -144,11 +144,15 @@ protected ConnectionFactory[] createConnectionFactories(final HttpConfiguration
                 sslContextFactory, connectionFactories.toArray(new ConnectionFactory[0]));
     }
 
-    private QuicServerConnector createQuicServerConnector(
-            org.eclipse.jetty.server.Server server, ServerQuicConfiguration configuration) {
-        QuicServerConnector connector =
-                new QuicServerConnector(
-                        server, configuration, new HTTP3ServerConnectionFactory(configuration));
+    private QuicheServerConnector createQuicServerConnector(
+            org.eclipse.jetty.server.Server server, HttpConfiguration httpConfiguration) {
+        QuicheServerQuicConfiguration quicConfiguration = createQuicConfiguration();
+        QuicheServerConnector connector =
+                new QuicheServerConnector(
+                        server,
+                        getQuicServerSslContextFactory(),
+                        quicConfiguration,
+                        new HTTP3ServerConnectionFactory(httpConfiguration));
         final String address = getHelped().getAddress();
         if (address != null) {
             connector.setHost(address);
@@ -243,11 +247,10 @@ private SslContextFactory.Server getQuicServerSslContextFactory() {
         return sslContextFactory;
     }
 
-    private ServerQuicConfiguration createQuicConfiguration(
-            SslContextFactory.Server sslContextFactory) {
-        Path pemWorkDirectory = getHttp3PemWorkDirectoryPath();
-        ServerQuicConfiguration configuration =
-                new ServerQuicConfiguration(sslContextFactory, pemWorkDirectory);
+    private QuicheServerQuicConfiguration createQuicConfiguration() {
+        QuicheServerQuicConfiguration configuration =
+                HTTP3ServerQuicConfiguration.configure(
+                        new QuicheServerQuicConfiguration(getHttp3PemWorkDirectoryPath()));
         configuration.setOutputBufferSize(getHttpOutputBufferSize());
         return configuration;
     }

pom.xml

@@ -56,7 +56,7 @@
         <lib-jackson-version>2.22.3</lib-jackson-version>
         <lib-jackson-annotations-version>2.22</lib-jackson-annotations-version>
         <lib-joda-time-version>2.14.2</lib-joda-time-version>
-        <lib-jetty-version>12.0.39</lib-jetty-version>
+        <lib-jetty-version>12.1.14</lib-jetty-version>
         <lib-json-version>20260522</lib-json-version>
         <lib-log4j-version>1.2.17</lib-log4j-version>
         <lib-hamcrest-version>1.3</lib-hamcrest-version>