Upgrade Jetty from 9.4.49 to 11.0.13

35 files changed, 319 insertions, 248 deletions

diff --git a/application/pom.xml b/application/pom.xml
index d1aea1d6a78..d404cb9bbf5 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -133,8 +133,8 @@
 
     <!-- START JETTY embedded jars -->
     <dependency>
-      <groupId>org.eclipse.jetty.alpn</groupId>
-      <artifactId>alpn-api</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>
@@ -146,35 +146,43 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-continuation</artifactId>
-      <scope>test</scope>
+      <artifactId>jetty-http</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-      <scope>test</scope>
+      <artifactId>jetty-util</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
+    </dependency>
+    <!-- END JETTY embedded jars -->
+
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
@@ -184,8 +192,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- END JETTY embedded jars -->
-
   </dependencies>
 
   <build>
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 78178c9f5dc..3dc0f370e53 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -44,8 +44,7 @@
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
         <jaxb.version>2.3.0</jaxb.version>
-        <jetty.version>9.4.49.v20220914</jetty.version>
-        <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
+        <jetty.version>11.0.13</jetty.version>
         <org.lz4.version>1.8.0</org.lz4.version>
         <org.json.version>20220320</org.json.version> <!-- TODO: Remove on Vespa 9 -->
         <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom -->
@@ -206,22 +205,20 @@
                                         <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test</include>
                                         <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test</include>
                                         <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.eclipse.jetty.alpn:alpn-api:jar:${jetty-alpn.version}:test</include>
                                         <include>org.eclipse.jetty.http2:http2-common:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty.http2:http2-server:${jetty.version}:test</include>
+                                        <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-http:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-io:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-jmx:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-security:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-server:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-servlet:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-servlets:jar:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version}:test</include>
                                         <include>org.eclipse.jetty:jetty-util:${jetty.version}:test</include>
 
                                         <include>org.hamcrest:hamcrest-core:1.3:test</include>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index bdcaab3900b..2b1d2253534 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -14,6 +14,7 @@
   <artifactId>container-core</artifactId>
   <version>8-SNAPSHOT</version>
   <packaging>container-plugin</packaging>
+
   <dependencies>
 
     <!-- COMPILE scope -->
@@ -139,40 +140,119 @@
 
     <!-- START JETTY embedded jars -->
     <dependency>
-      <groupId>org.eclipse.jetty.alpn</groupId>
-      <artifactId>alpn-api</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>
       <artifactId>http2-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
+      <!-- Required for JDK9ServerALPNProcessor through ServiceLoader API -->
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-alpn-java-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-continuation</artifactId>
+      <artifactId>jetty-http</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
+      <artifactId>jetty-util</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
     </dependency>
     <!-- END JETTY embedded jars -->
 
@@ -281,11 +361,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <scope>provided</scope>
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/utils/MultiPartFormParser.java b/container-core/src/main/java/com/yahoo/container/jdisc/utils/MultiPartFormParser.java
index 47ff229cc7b..57fbd5eb96c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/utils/MultiPartFormParser.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/utils/MultiPartFormParser.java
@@ -3,9 +3,9 @@ package com.yahoo.container.jdisc.utils;
 
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.yolean.Exceptions;
-import org.eclipse.jetty.http.MultiPartFormInputStream;
+import jakarta.servlet.http.Part;
+import org.eclipse.jetty.server.MultiPartFormInputStream;
 
-import javax.servlet.http.Part;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java
index b194124294c..c2faa1cd10a 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java
@@ -2,7 +2,7 @@
 package com.yahoo.jdisc.http;
 
 import org.eclipse.jetty.http.HttpCookie;
-import org.eclipse.jetty.server.CookieCutter;
+import org.eclipse.jetty.server.Cookies;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -180,7 +180,7 @@ public class Cookie {
     }
 
     public static List<Cookie> fromCookieHeader(String headerVal) {
-        CookieCutter cookieCutter = new CookieCutter();
+        Cookies cookieCutter = new Cookies();
         cookieCutter.addCookieField(headerVal);
         return Arrays.stream(cookieCutter.getCookies())
                 .map(servletCookie -> {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 598a924b327..4ad38a9f965 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -8,15 +8,14 @@ import com.yahoo.jdisc.handler.ContentChannel;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.service.CurrentContainer;
-import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.util.MultiMap;
+import org.eclipse.jetty.util.UrlEncoded;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.security.Principal;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -116,15 +115,10 @@ public class HttpRequest extends Request {
     }
 
     private static Map<String, List<String>> getUriQueryParameters(URI uri) {
-        MultiMap<String> queryParameters = new MultiMap<>();
-        new HttpURI(uri).decodeQueryTo(queryParameters);
-
-        // Do a deep copy so we do not leak Jetty classes outside
-        Map<String, List<String>> deepCopiedQueryParameters = new HashMap<>();
-        for (Map.Entry<String, List<String>> entry : queryParameters.entrySet()) {
-            deepCopiedQueryParameters.put(entry.getKey(), new ArrayList<>(entry.getValue()));
-        }
-        return deepCopiedQueryParameters;
+        if (uri.getRawQuery() == null) return Map.of();
+        MultiMap<String> params = new MultiMap<>();
+        UrlEncoded.decodeUtf8To(uri.getRawQuery(), params);
+        return Map.copyOf(params);
     }
 
     public Method getMethod() {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
index 13a63efeaa9..5b51eeee7d6 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLogRequestLog.java
@@ -8,6 +8,7 @@ import com.yahoo.container.logging.RequestLog;
 import com.yahoo.container.logging.RequestLogEntry;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.http.ServerConfig;
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.http2.HTTP2Stream;
 import org.eclipse.jetty.http2.server.HttpTransportOverHTTP2;
 import org.eclipse.jetty.server.HttpChannel;
@@ -16,7 +17,6 @@ import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 
-import javax.servlet.http.HttpServletRequest;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.time.Instant;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 6282e334409..f2118008af3 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -9,6 +9,8 @@ import com.yahoo.jdisc.http.ssl.impl.DefaultConnectorSsl;
 import com.yahoo.security.tls.MixedMode;
 import com.yahoo.security.tls.TransportSecurityUtils;
 import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
+import org.eclipse.jetty.http.HttpCompliance;
+import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.http2.server.AbstractHTTP2ServerConnectionFactory;
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
 import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
@@ -137,8 +139,17 @@ public class ConnectorFactory {
         httpConfig.setOutputBufferSize(connectorConfig.outputBufferSize());
         httpConfig.setRequestHeaderSize(connectorConfig.requestHeaderSize());
         httpConfig.setResponseHeaderSize(connectorConfig.responseHeaderSize());
+
+        // Disable use of ByteBuffer.allocateDirect()
+        httpConfig.setUseInputDirectByteBuffers(false);
+        httpConfig.setUseOutputDirectByteBuffers(false);
+
+        httpConfig.setHttpCompliance(HttpCompliance.RFC7230);
+        // TODO Vespa 9 Use default URI compliance (LEGACY == old Jetty 9.4 compliance)
+        httpConfig.setUriCompliance(UriCompliance.LEGACY);
         if (isSslEffectivelyEnabled(connectorConfig)) {
-            httpConfig.addCustomizer(new SecureRequestCustomizer());
+            // Explicitly disable SNI checking as Jetty's SNI checking trust manager is not part of our SSLContext trust manager chain
+            httpConfig.addCustomizer(new SecureRequestCustomizer(false, false, -1, false));
         }
         String serverNameFallback = connectorConfig.serverName().fallback();
         if (!serverNameFallback.isBlank()) httpConfig.setServerAuthority(new HostPort(serverNameFallback));
@@ -169,12 +180,14 @@ public class ConnectorFactory {
     }
 
     private SslConnectionFactory newSslConnectionFactory(Metric metric, ConnectionFactory wrappedFactory) {
-        SslConnectionFactory connectionFactory = new SslConnectionFactory(createSslContextFactory(), wrappedFactory.getProtocol());
-        connectionFactory.addBean(new SslHandshakeFailedListener(metric, connectorConfig.name(), connectorConfig.listenPort()));
-        return connectionFactory;
+        var fac = new SslConnectionFactory(createSslContextFactory(), wrappedFactory.getProtocol());
+        fac.setDirectBuffersForDecryption(false);
+        fac.setDirectBuffersForDecryption(false);
+        fac.addBean(new SslHandshakeFailedListener(metric, connectorConfig.name(), connectorConfig.listenPort()));
+        return fac;
     }
 
-    private SslContextFactory createSslContextFactory() {
+    private SslContextFactory.Server createSslContextFactory() {
         DefaultConnectorSsl ssl = new DefaultConnectorSsl();
         sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort());
         return ssl.createSslContextFactory();
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
index ac50cbbb518..342d7ab9c4a 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java
@@ -4,14 +4,24 @@ package com.yahoo.jdisc.http.server.jetty;
 import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.security.SslContextBuilder;
+import com.yahoo.security.TrustAllX509TrustManager;
 import com.yahoo.security.tls.TransportSecurityOptions;
 import com.yahoo.security.tls.TransportSecurityUtils;
-import com.yahoo.security.TrustAllX509TrustManager;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.ProxyProtocolClientConnectionFactory;
 import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.server.DetectorConnectionFactory;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.SslConnectionFactory;
@@ -19,14 +29,6 @@ import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 import javax.net.ssl.SSLContext;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.HashMap;
@@ -89,7 +91,7 @@ class HealthCheckProxyHandler extends HandlerWrapper {
                 Optional.ofNullable(targetConnector.getConnectionFactory(SslConnectionFactory.class))
                         .or(() -> Optional.ofNullable(targetConnector.getConnectionFactory(DetectorConnectionFactory.class))
                                 .map(detectorConnFactory -> detectorConnFactory.getBean(SslConnectionFactory.class)))
-                        .map(connFactory -> (SslContextFactory.Server) connFactory.getSslContextFactory())
+                        .map(SslConnectionFactory::getSslContextFactory)
                         .orElseThrow(() -> new IllegalArgumentException("Health check proxy can only target https port"));
         boolean proxyProtocol = targetConnector.connectorConfig().proxyProtocol().enabled();
         return new ProxyTarget(targetPort, clientTimeout,handlerTimeout, cacheExpiry, sslContextFactory, proxyProtocol);
@@ -269,13 +271,14 @@ class HealthCheckProxyHandler extends HandlerWrapper {
                 synchronized (this) {
                     if (client == null) {
                         int timeoutMillis = (int) clientTimeout.toMillis();
-                        SslContextFactory.Client clientSsl = new SslContextFactory.Client();
+                        var clientSsl = new SslContextFactory.Client();
                         clientSsl.setHostnameVerifier((__, ___) -> true);
                         clientSsl.setSslContext(getSslContext(serverSsl));
-                        HttpClient client = new HttpClient(clientSsl);
+                        var connector = new ClientConnector();
+                        connector.setSslContextFactory(clientSsl);
+                        HttpClient client = new HttpClient(new HttpClientTransportOverHTTP(connector));
                         client.setMaxConnectionsPerDestination(4);
                         client.setConnectTimeout(timeoutMillis);
-                        client.setStopTimeout(timeoutMillis);
                         client.setIdleTimeout(timeoutMillis);
                         client.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, "health-check-proxy-client"));
                         client.start();
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index 9292e2024df..b4c933c1168 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
@@ -12,6 +12,11 @@ import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.HttpHeaders;
 import com.yahoo.jdisc.http.HttpRequest;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http2.ErrorCode;
 import org.eclipse.jetty.http2.server.HTTP2ServerConnection;
 import org.eclipse.jetty.io.Connection;
@@ -20,11 +25,6 @@ import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.Callback;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
index 8a298fb3268..d45a8789e4c 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
@@ -3,10 +3,10 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.service.CurrentContainer;
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.Utf8Appendable;
 
-import javax.servlet.http.HttpServletRequest;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.cert.X509Certificate;
@@ -94,6 +94,6 @@ class HttpRequestFactory {
     }
 
     private static X509Certificate[] getCertChain(HttpServletRequest servletRequest) {
-        return (X509Certificate[]) servletRequest.getAttribute("javax.servlet.request.X509Certificate");
+        return (X509Certificate[]) servletRequest.getAttribute(RequestUtils.SERVLET_REQUEST_X509CERT);
     }
 }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
index 3fb81cb5352..81789881b68 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java
@@ -4,6 +4,11 @@ package com.yahoo.jdisc.http.server.jetty;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.http.ServerConfig;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.AsyncContextEvent;
@@ -11,14 +16,8 @@ import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpChannelState;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.util.component.Graceful;
 
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,12 +26,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.function.ObjLongConsumer;
 import java.util.stream.Collectors;
@@ -49,7 +46,7 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful
 
     static final String requestTypeAttribute = "requestType";
 
-    private final AtomicReference<FutureCallback> shutdown = new AtomicReference<>();
+    private final Shutdown shutdown;
     private final List<String> monitoringHandlerPaths;
     private final List<String> searchHandlerPaths;
     private final Set<String> ignoredUserAgents;
@@ -66,6 +63,10 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful
         this.monitoringHandlerPaths = monitoringHandlerPaths;
         this.searchHandlerPaths = searchHandlerPaths;
         this.ignoredUserAgents = Set.copyOf(ignoredUserAgents);
+        this.shutdown = new Shutdown(this) {
+            @Override public boolean isShutdownDone() { return inFlight.get() == 0; }
+        };
+
     }
 
     private final AsyncListener completionWatcher = new AsyncListener() {
@@ -97,7 +98,7 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful
 
         try {
             Handler handler = getHandler();
-            if (handler != null && shutdown.get() == null && isStarted()) {
+            if (handler != null && !shutdown.isShutdown() && isStarted()) {
                 handler.handle(path, baseRequest, request, response);
             } else if ( ! baseRequest.isHandled()) {
                 baseRequest.setHandled(true);
@@ -129,14 +130,9 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful
                             .increment());
         }
         long live = inFlight.decrementAndGet();
-        FutureCallback shutdownCb = shutdown.get();
-        if (shutdownCb != null) {
-            if (flushableResponse != null) {
-                flushableResponse.flushBuffer();
-            }
-            if (live == 0) {
-                shutdownCb.succeeded();
-            }
+        if (shutdown.isShutdown()) {
+            if (flushableResponse != null) flushableResponse.flushBuffer();
+            if (live == 0) shutdown.check();
         }
     }
 
@@ -162,35 +158,19 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful
 
     @Override
     protected void doStart() throws Exception {
-        shutdown.set(null);
+        shutdown.cancel();
         super.doStart();
     }
 
     @Override
     protected void doStop() throws Exception {
+        shutdown.cancel();
         super.doStop();
-        FutureCallback shutdownCb = shutdown.get();
-        if ( ! shutdownCb.isDone()) {
-            shutdownCb.failed(new TimeoutException());
-        }
     }
 
-    @Override
-    public Future<Void> shutdown() {
-        FutureCallback shutdownCb = new FutureCallback(false);
-        shutdown.compareAndSet(null, shutdownCb);
-        shutdownCb = shutdown.get();
-        if (inFlight.get() == 0) {
-            shutdownCb.succeeded();
-        }
-        return shutdownCb;
-    }
+    @Override public CompletableFuture<Void> shutdown() { return shutdown.shutdown(); }
+    @Override public boolean isShutdown() { return shutdown.isShutdown(); }
 
-    @Override
-    public boolean isShutdown() {
-        FutureCallback futureCallback = shutdown.get();
-        return futureCallback != null && futureCallback.isDone();
-    }
 
     static class Dimensions {
         final String protocol;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
index 4b4aff0a9bd..bd052f14867 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java
@@ -5,13 +5,13 @@ import com.yahoo.container.logging.AccessLogEntry;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.handler.OverloadException;
 import com.yahoo.jdisc.http.HttpRequest.Method;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Map;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
index b3069a64821..b17877cee84 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
@@ -3,16 +3,13 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ConnectorConfig;
-import org.eclipse.jetty.http.HttpCompliance;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.io.ConnectionStatistics;
 import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import java.net.Socket;
-import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -26,8 +23,6 @@ class JDiscServerConnector extends ServerConnector {
     private final Metric.Context metricCtx;
     private final ConnectionStatistics statistics;
     private final ConnectorConfig config;
-    private final boolean tcpKeepAlive;
-    private final boolean tcpNoDelay;
     private final Metric metric;
     private final String connectorName;
     private final int listenPort;
@@ -36,14 +31,13 @@ class JDiscServerConnector extends ServerConnector {
                          ConnectionMetricAggregator connectionMetricAggregator, ConnectionFactory... factories) {
         super(server, factories);
         this.config = config;
-        this.tcpKeepAlive = config.tcpKeepAliveEnabled();
-        this.tcpNoDelay = config.tcpNoDelay();
         this.metric = metric;
         this.connectorName = config.name();
         this.listenPort = config.listenPort();
         this.metricCtx = metric.createContext(createConnectorDimensions(listenPort, connectorName, 0));
 
         this.statistics = new ConnectionStatistics();
+        setAcceptedTcpNoDelay(config.tcpNoDelay());
         addBean(statistics);
         ConnectorConfig.Throttling throttlingConfig = config.throttling();
         if (throttlingConfig.enabled()) {
@@ -56,17 +50,6 @@ class JDiscServerConnector extends ServerConnector {
         setAcceptQueueSize(config.acceptQueueSize());
         setReuseAddress(config.reuseAddress());
         setIdleTimeout((long) (config.idleTimeout() * 1000));
-        addBean(HttpCompliance.RFC7230);
-    }
-
-    @Override
-    protected void configure(final Socket socket) {
-        super.configure(socket);
-        try {
-            socket.setKeepAlive(tcpKeepAlive);
-            socket.setTcpNoDelay(tcpNoDelay);
-        } catch (SocketException ignored) {
-        }
     }
 
     public ConnectionStatistics getStatistics() {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
index 53d8698c417..6406125dcc3 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
@@ -30,6 +30,7 @@ import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.StandardConstants;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
@@ -113,7 +114,7 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
                 info.setProxyProtocolVersion("v2");
             }
             if (connection.getEndPoint() instanceof ProxyConnectionFactory.ProxyEndPoint) {
-                InetSocketAddress remoteAddress = connection.getEndPoint().getRemoteAddress();
+                var remoteAddress = connection.getEndPoint().getRemoteSocketAddress();
                 info.setRemoteAddress(remoteAddress);
             }
         });
@@ -243,7 +244,7 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
         private long httpBytesSent = 0;
         private long requests = 0;
         private long responses = 0;
-        private InetSocketAddress remoteAddress;
+        private SocketAddress remoteAddress;
         private byte[] sslSessionId;
         private String sslProtocol;
         private String sslCipherSuite;
@@ -290,7 +291,7 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
 
         synchronized ConnectionInfo incrementResponses() { ++this.responses; return this; }
 
-        synchronized ConnectionInfo setRemoteAddress(InetSocketAddress remoteAddress) {
+        synchronized ConnectionInfo setRemoteAddress(SocketAddress remoteAddress) {
             this.remoteAddress = remoteAddress;
             return this;
         }
@@ -354,9 +355,9 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
                 builder.withLocalAddress(localAddress.getHostString())
                         .withLocalPort(localAddress.getPort());
             }
-            if (remoteAddress != null) {
-                builder.withRemoteAddress(remoteAddress.getHostString())
-                        .withRemotePort(remoteAddress.getPort());
+            if (remoteAddress instanceof InetSocketAddress isa) {
+                builder.withRemoteAddress(isa.getHostString())
+                        .withRemotePort(isa.getPort());
             }
             if (sslProtocol != null && sslCipherSuite != null && sslSessionId != null) {
                 builder.withSslProtocol(sslProtocol)
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 775c903f5f8..7b723b3a48e 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -27,8 +27,6 @@ import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.server.handler.gzip.GzipHttpOutputInterceptor;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.log.JavaUtilLog;
-import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 import javax.management.remote.JMXServiceURL;
@@ -70,8 +68,6 @@ public class JettyHttpServer extends AbstractServerProvider {
         if (connectorFactories.allComponents().isEmpty())
             throw new IllegalArgumentException("No connectors configured.");
 
-        initializeJettyLogging();
-
         server = new Server();
         server.setStopTimeout((long)(serverConfig.stopTimeout() * 1000.0));
         server.setRequestLog(new AccessLogRequestLog(requestLog, serverConfig.accessLog()));
@@ -96,15 +92,6 @@ public class JettyHttpServer extends AbstractServerProvider {
         this.metricsReporter = new ServerMetricReporter(metric, server);
     }
 
-    private static void initializeJettyLogging() {
-        // Note: Jetty is logging stderr if no logger is explicitly configured
-        try {
-            Log.setLog(new JavaUtilLog());
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to initialize logging framework for Jetty");
-        }
-    }
-
     private static void setupJmx(Server server, ServerConfig serverConfig) {
         if (serverConfig.jmx().enabled()) {
             System.setProperty("java.rmi.server.hostname", "localhost");
@@ -152,7 +139,7 @@ public class JettyHttpServer extends AbstractServerProvider {
         }
         StatisticsHandler root = newGenericStatisticsHandler();
         addChainToRoot(root, List.of(
-                newResponseStatisticsHandler(serverCfg), newGzipHandler(serverCfg), perConnectorHandlers));
+                newResponseStatisticsHandler(serverCfg), newGzipHandler(), perConnectorHandlers));
         return root;
     }
 
@@ -253,22 +240,18 @@ public class JettyHttpServer extends AbstractServerProvider {
         return statisticsHandler;
     }
 
-    private static GzipHandler newGzipHandler(ServerConfig serverConfig) {
-        GzipHandler gzipHandler = new GzipHandlerWithVaryHeaderFixed();
-        gzipHandler.setCompressionLevel(serverConfig.responseCompressionLevel());
-        gzipHandler.setInflateBufferSize(8 * 1024);
-        gzipHandler.setIncludedMethods("GET", "POST", "PUT", "PATCH");
-        return gzipHandler;
-    }
+    private static GzipHandler newGzipHandler() { return new GzipHandlerWithVaryHeaderFixed(); }
 
     /** A subclass which overrides Jetty's default behavior of including user-agent in the vary field */
     private static class GzipHandlerWithVaryHeaderFixed extends GzipHandler {
 
-        @Override
-        public HttpField getVaryField() {
-            return GzipHttpOutputInterceptor.VARY_ACCEPT_ENCODING;
+        GzipHandlerWithVaryHeaderFixed() {
+            setInflateBufferSize(8 * 1024);
+            setIncludedMethods("GET", "POST", "PUT", "PATCH");
         }
 
+        @Override public HttpField getVaryField() { return GzipHttpOutputInterceptor.VARY_ACCEPT_ENCODING; }
+
     }
 
 }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java
index 1bc862bc787..da4de957739 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java
@@ -1,12 +1,12 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.server.jetty;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.http2.server.HTTP2ServerConnection;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.Request;
-
-import javax.servlet.http.HttpServletRequest;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
 
 /**
  * @author bjorncs
@@ -15,7 +15,7 @@ public class RequestUtils {
     public static final String JDISC_REQUEST_X509CERT = "jdisc.request.X509Certificate";
     public static final String JDISC_REQUEST_CHAIN = "jdisc.request.chain";
     public static final String JDISC_RESPONSE_CHAIN = "jdisc.response.chain";
-    public static final String SERVLET_REQUEST_X509CERT = "javax.servlet.request.X509Certificate";
+    public static final String SERVLET_REQUEST_X509CERT = SecureRequestCustomizer.JAKARTA_SERVLET_REQUEST_X_509_CERTIFICATE;
 
     // The local port as reported by servlet spec. This will be influenced by Host header and similar mechanisms.
     // The request URI uses the local listen port as the URI is used for handler routing/bindings.
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
index 4b66715fcf7..d853282a5f5 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
@@ -2,9 +2,9 @@
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.handler.CompletionHandler;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
index 3703878f595..2f2c48e0b48 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletRequestReader.java
@@ -3,10 +3,10 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.handler.CompletionHandler;
 import com.yahoo.jdisc.handler.ContentChannel;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Objects;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
index e90dde0e4eb..6afb55f5b13 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
@@ -9,10 +9,10 @@ import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.HttpHeaders;
 import com.yahoo.jdisc.http.HttpResponse;
 import com.yahoo.jdisc.service.BindingSetNotFoundException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.MimeTypes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
index b420aabc598..96f0cdebd62 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/TlsClientAuthenticationEnforcer.java
@@ -3,13 +3,13 @@ package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.http.ConnectorConfig;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
index ecbc451ead1..bdcc3f9e40a 100644
--- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
@@ -28,7 +28,8 @@ reuseAddress                        bool     default=true
 # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int).
 idleTimeout                         double   default=180.0
 
-# Whether or not to have socket keep alive turned on.
+# TODO Vespa 9 Remove
+# Has no effect since Jetty 11 upgrade
 tcpKeepAliveEnabled                 bool     default=false
 
 # Enable/disable TCP_NODELAY (disable/enable Nagle's algorithm).
diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
index f34fd523207..c15cb6b2cc4 100644
--- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
+++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
@@ -4,7 +4,8 @@ namespace=jdisc.http
 # Whether to enable developer mode, where stack traces etc are visible in response bodies.
 developerMode                         bool   default=false
 
-# The gzip compression level to use, if compression is enabled in a request.
+# TODO Vespa 9 Remove
+# Has no effect since Jetty 11 upgrade
 responseCompressionLevel              int    default=6
 
 # Whether the request body of POSTed forms should be removed (form parameters are available as request parameters).
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index 1ff2783cc53..ce205b1a893 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
@@ -5,6 +5,8 @@ import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.ServerConfig;
 import com.yahoo.jdisc.http.ssl.impl.ConfiguredSslContextFactoryProvider;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -12,8 +14,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
index 8b18c8cf09d..fdb9f2226de 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ErrorResponseContentCreatorTest.java
@@ -2,9 +2,9 @@
 package com.yahoo.jdisc.http.server.jetty;
 
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
index a23a3505bcb..e4b82db5b9f 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
@@ -8,15 +8,17 @@ import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.service.CurrentContainer;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Steinar Knutsen
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
index 165659389ec..502702ccf35 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java
@@ -2,6 +2,9 @@
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.http.server.jetty.HttpResponseStatisticsCollector.StatisticsEntry;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.http.HttpVersion;
@@ -10,6 +13,7 @@ import org.eclipse.jetty.http.MetaData.Response;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.HttpChannelOverHttp;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpTransport;
 import org.eclipse.jetty.server.Request;
@@ -19,9 +23,6 @@ import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -164,8 +165,8 @@ public class HttpResponseStatisticsCollectorTest {
     }
     private Request testRequest(String scheme, int responseCode, String httpMethod, String path,
                                 com.yahoo.jdisc.Request.RequestType explicitRequestType) {
-        HttpChannel channel = new HttpChannel(connector, new HttpConfiguration(), null, new DummyTransport());
-        MetaData.Request metaData = new MetaData.Request(httpMethod, new HttpURI(scheme + "://" + path), HttpVersion.HTTP_1_1, new HttpFields());
+        HttpChannel channel = new HttpChannelOverHttp(null, connector, new HttpConfiguration(), null, new DummyTransport());
+        MetaData.Request metaData = new MetaData.Request(httpMethod, HttpURI.build(scheme + "://" + path), HttpVersion.HTTP_1_1, HttpFields.build());
         Request req = channel.getRequest();
         if (explicitRequestType != null)
             req.setAttribute("requestType", explicitRequestType);
@@ -192,7 +193,7 @@ public class HttpResponseStatisticsCollectorTest {
 
     private final class DummyTransport implements HttpTransport {
         @Override
-        public void send(Response info, boolean head, ByteBuffer content, boolean lastContent, Callback callback) {
+        public void send(MetaData.Request request, Response response, ByteBuffer byteBuffer, boolean b, Callback callback) {
             callback.succeeded();
         }
 
@@ -202,11 +203,6 @@ public class HttpResponseStatisticsCollectorTest {
         }
 
         @Override
-        public boolean isOptimizedForDirectBuffers() {
-            return false;
-        }
-
-        @Override
         public void push(MetaData.Request request) {
         }
 
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 7cce9f2a9ff..ae1a6494acd 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -807,6 +807,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
                 post.setProtocolVersion(HttpVersion.HTTP_1_1);
                 request = post;
             }
+            request.addHeader("Connection", "close");
             return executorService.submit(() -> httpClient.execute(request));
         }
 
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 318067ac634..39b6dcdc6d5 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -186,9 +186,10 @@ public class HttpServerTest {
     @Test
     void requireThatServerCanEchoCompressed() throws Exception {
         final JettyTestDriver driver = JettyTestDriver.newInstance(new EchoRequestHandler());
-        SimpleHttpClient client = driver.newClient(true);
-        client.get("/status.html")
-                .expectStatusCode(is(OK));
+        try (SimpleHttpClient client = driver.newClient(true)) {
+            client.get("/status.html")
+                    .expectStatusCode(is(OK));
+        }
         assertTrue(driver.close());
     }
 
@@ -532,9 +533,9 @@ public class HttpServerTest {
                 .withTrustStore(certificateFile)
                 .build();
 
-        new SimpleHttpClient(trustStoreOnlyCtx, driver.server().getListenPort(), false)
-                .get("/dummy.html")
-                .expectStatusCode(is(UNAUTHORIZED));
+        try (var c = new SimpleHttpClient(trustStoreOnlyCtx, driver.server().getListenPort(), false)) {
+            c.get("/dummy.html").expectStatusCode(is(UNAUTHORIZED));
+        }
 
         assertTrue(driver.close());
     }
@@ -550,9 +551,9 @@ public class HttpServerTest {
                 .withTrustStore(certificateFile)
                 .build();
 
-        new SimpleHttpClient(trustStoreOnlyCtx, driver.server().getListenPort(), false)
-                .get("/status.html")
-                .expectStatusCode(is(OK));
+        try (var c = new SimpleHttpClient(trustStoreOnlyCtx, driver.server().getListenPort(), false)) {
+            c.get("/status.html").expectStatusCode(is(OK));
+        }
 
         assertTrue(driver.close());
     }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
index d4d6dcee957..6cd6f05933a 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/ProxyProtocolTest.java
@@ -12,6 +12,8 @@ import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.assertj.core.api.Assertions;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -185,14 +187,15 @@ class ProxyProtocolTest {
 
     // Using Jetty's http client as Apache httpclient does not support the proxy-protocol v1/v2.
     private static HttpClient createJettyHttpClient(Path certificateFile) throws Exception {
-        SslContextFactory.Client clientSslCtxFactory = new SslContextFactory.Client();
-        clientSslCtxFactory.setHostnameVerifier(NoopHostnameVerifier.INSTANCE);
-        clientSslCtxFactory.setSslContext(new SslContextBuilder().withTrustStore(certificateFile).build());
-
-        HttpClient client = new HttpClient(clientSslCtxFactory);
-        client.setConnectTimeout(60*1000);
-        client.setStopTimeout(60*1000);
-        client.setIdleTimeout(60*1000);
+        var ssl = new SslContextFactory.Client();
+        ssl.setHostnameVerifier(NoopHostnameVerifier.INSTANCE);
+        ssl.setSslContext(new SslContextBuilder().withTrustStore(certificateFile).build());
+        var connector = new ClientConnector();
+        connector.setSslContextFactory(ssl);
+        HttpClient client = new HttpClient(new HttpClientTransportOverHTTP(connector));
+        int timeout = 60 * 1000;
+        client.setConnectTimeout(timeout);
+        client.setIdleTimeout(timeout);
         client.start();
         return client;
     }
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index f62cc69a428..c327b73d953 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -105,8 +105,8 @@
 
         <!-- START JETTY embedded jars -->
         <exclusion>
-          <groupId>org.eclipse.jetty.alpn</groupId>
-          <artifactId>alpn-api</artifactId>
+          <groupId>org.eclipse.jetty.http2</groupId>
+          <artifactId>http2-common</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty.http2</groupId>
@@ -118,11 +118,19 @@
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-alpn-server</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-client</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-continuation</artifactId>
+          <artifactId>jetty-http</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-io</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
@@ -138,7 +146,11 @@
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-servlets</artifactId>
+          <artifactId>jetty-util</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.toolchain</groupId>
+          <artifactId>jetty-jakarta-servlet-api</artifactId>
         </exclusion>
         <!-- END JETTY embedded jars -->
       </exclusions>
diff --git a/container-test/pom.xml b/container-test/pom.xml
index d2806bb0330..d4da20cf9fe 100644
--- a/container-test/pom.xml
+++ b/container-test/pom.xml
@@ -116,8 +116,8 @@
 
     <!-- START JETTY embedded jars -->
     <dependency>
-      <groupId>org.eclipse.jetty.alpn</groupId>
-      <artifactId>alpn-api</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>
@@ -129,11 +129,19 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-continuation</artifactId>
+      <artifactId>jetty-http</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -149,7 +157,11 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
+      <artifactId>jetty-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
     </dependency>
     <!-- END JETTY embedded jars -->
   </dependencies>
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index 7d00f9ba58e..bbac77d9c0b 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -152,6 +152,10 @@
           <groupId>org.eclipse.jetty.http2</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.toolchain</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index d1fc3e4f76a..a9c3cfa82f8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -900,9 +900,9 @@
                 <version>${eclipse-collections.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.jetty.alpn</groupId>
-                <artifactId>alpn-api</artifactId>
-                <version>${jetty-alpn.version}</version>
+                <groupId>org.eclipse.jetty.http2</groupId>
+                <artifactId>http2-common</artifactId>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
@@ -916,12 +916,12 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-client</artifactId>
+                <artifactId>jetty-alpn-server</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-continuation</artifactId>
+                <artifactId>jetty-client</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
@@ -931,22 +931,22 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <artifactId>jetty-io</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <artifactId>jetty-jmx</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
+                <artifactId>jetty-server</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jmx</artifactId>
+                <artifactId>jetty-servlet</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
@@ -955,6 +955,11 @@
                 <version>${jetty.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.eclipse.jetty.toolchain</groupId>
+                <artifactId>jetty-jakarta-servlet-api</artifactId>
+                <version>${jetty-servlet-api.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
                 <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest -->
@@ -1117,8 +1122,8 @@
         <felix.log.version>1.0.1</felix.log.version>
         <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava -->
         <hdrhistogram.version>2.1.12</hdrhistogram.version>
-        <jetty.version>9.4.49.v20220914</jetty.version>
-        <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
+        <jetty.version>11.0.13</jetty.version>
+        <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version>
         <jjwt.version>0.11.2</jjwt.version>
         <jna.version>5.11.0</jna.version>
         <junit.version>5.8.1</junit.version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 1e38b6029ba..5a29ad22c51 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -2,8 +2,8 @@
 
 #[non-test]
 # Contains dependencies that are not used exclusively in 'test' scope
-ai.djl.huggingface:tokenizers:0.20.0
 ai.djl:api:0.20.0
+ai.djl.huggingface:tokenizers:0.20.0
 aopalliance:aopalliance:1.0
 backport-util-concurrent:backport-util-concurrent:3.1
 biz.aQute.bnd:biz.aQute.bnd.util:6.1.0
@@ -146,23 +146,21 @@ org.codehaus.plexus:plexus-sec-dispatcher:2.0
 org.codehaus.plexus:plexus-utils:3.3.1
 org.eclipse.collections:eclipse-collections:11.0.0
 org.eclipse.collections:eclipse-collections-api:11.0.0
-org.eclipse.jetty:jetty-alpn-java-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-alpn-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-client:9.4.49.v20220914
-org.eclipse.jetty:jetty-continuation:9.4.49.v20220914
-org.eclipse.jetty:jetty-http:9.4.49.v20220914
-org.eclipse.jetty:jetty-io:9.4.49.v20220914
-org.eclipse.jetty:jetty-jmx:9.4.49.v20220914
-org.eclipse.jetty:jetty-security:9.4.49.v20220914
-org.eclipse.jetty:jetty-server:9.4.49.v20220914
-org.eclipse.jetty:jetty-servlet:9.4.49.v20220914
-org.eclipse.jetty:jetty-servlets:9.4.49.v20220914
-org.eclipse.jetty:jetty-util:9.4.49.v20220914
-org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914
-org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715
-org.eclipse.jetty.http2:http2-common:9.4.49.v20220914
-org.eclipse.jetty.http2:http2-hpack:9.4.49.v20220914
-org.eclipse.jetty.http2:http2-server:9.4.49.v20220914
+org.eclipse.jetty:jetty-alpn-client:11.0.13
+org.eclipse.jetty:jetty-alpn-java-server:11.0.13
+org.eclipse.jetty:jetty-alpn-server:11.0.13
+org.eclipse.jetty:jetty-client:11.0.13
+org.eclipse.jetty:jetty-http:11.0.13
+org.eclipse.jetty:jetty-io:11.0.13
+org.eclipse.jetty:jetty-jmx:11.0.13
+org.eclipse.jetty:jetty-security:11.0.13
+org.eclipse.jetty:jetty-server:11.0.13
+org.eclipse.jetty:jetty-servlet:11.0.13
+org.eclipse.jetty:jetty-util:11.0.13
+org.eclipse.jetty.http2:http2-common:11.0.13
+org.eclipse.jetty.http2:http2-hpack:11.0.13
+org.eclipse.jetty.http2:http2-server:11.0.13
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
 org.fusesource.jansi:jansi:1.18