Migrate to Jetty 12.0.7 EE10

.github/workflows/ci.yml

@@ -13,6 +13,7 @@ jobs:
         java-version:
           - 17
           - 21
+          - 22-ea
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v3

CHANGES

@@ -1,3 +1,11 @@
+242
+- Update airbase to 151
+- Update Jetty to 12.0.7 and EE10
+- Add support for using virtual threads in the server
+- Update byte-buddy to 1.14.12
+- Update jjwt to 0.12.5
+- Update logback to 1.5.1
+
 240
 
 - Update airbase to 148

discovery/pom.xml

@@ -99,21 +99,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <artifactId>jetty-server</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-jakarta-servlet-api</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
             <scope>test</scope>
         </dependency>
 

discovery/src/test/java/io/airlift/discovery/client/TestServiceInventory.java

@@ -24,13 +24,13 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -110,7 +110,7 @@ public void testHttpServiceInventory()
             ServletHolder servletHolder = new ServletHolder(new ServiceInventoryServlet(serviceInventoryJson));
             ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
             context.addServlet(servletHolder, "/*");
-            HandlerCollection handlers = new HandlerCollection();
+            ContextHandlerCollection handlers = new ContextHandlerCollection();
             handlers.addHandler(context);
             server.setHandler(handlers);
 

event-http/pom.xml

@@ -77,20 +77,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <artifactId>jetty-server</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-jakarta-servlet-api</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
             <scope>test</scope>
         </dependency>
 

event-http/src/test/java/io/airlift/event/client/http/TestHttpEventClient.java

@@ -32,13 +32,13 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -193,7 +193,7 @@ private Server createServer(final DummyServlet servlet)
         ServletHolder servletHolder = new ServletHolder(servlet);
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
         context.addServlet(servletHolder, "/*");
-        HandlerCollection handlers = new HandlerCollection();
+        ContextHandlerCollection handlers = new ContextHandlerCollection();
         handlers.addHandler(context);
         server.setHandler(handlers);
         return server;

http-client/pom.xml

@@ -128,12 +128,12 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-client</artifactId>
+            <artifactId>jetty-http2-client</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-http-client-transport</artifactId>
+            <artifactId>jetty-http2-client-transport</artifactId>
         </dependency>
 
         <dependency>
@@ -167,14 +167,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-proxy</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -185,20 +185,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-proxy</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-server</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-jakarta-servlet-api</artifactId>
+            <groupId>org.eclipse.jetty.http2</groupId>
+            <artifactId>jetty-http2-server</artifactId>
             <scope>test</scope>
         </dependency>
 

http-client/src/main/java/io/airlift/http/client/jetty/AuthorizationPreservingHttpClient.java

@@ -2,8 +2,7 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
-import org.eclipse.jetty.client.HttpRequest;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.http.HttpField;
 
 import java.net.URI;
@@ -22,7 +21,7 @@ public AuthorizationPreservingHttpClient(HttpClientTransport transport)
     }
 
     @Override
-    protected Request copyRequest(HttpRequest oldRequest, URI newUri)
+    protected Request copyRequest(Request oldRequest, URI newUri)
     {
         Request newRequest = super.copyRequest(oldRequest, newUri);
 

http-client/src/main/java/io/airlift/http/client/jetty/BufferingResponseListener.java

@@ -5,8 +5,8 @@
 import io.airlift.http.client.GatheringByteArrayInputStream;
 import io.airlift.http.client.ResponseTooLargeException;
 import io.airlift.units.DataSize;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.Response;
+import org.eclipse.jetty.client.Result;
 import org.eclipse.jetty.http.HttpHeader;
 
 import java.nio.ByteBuffer;
@@ -23,7 +23,7 @@
 
 @ThreadSafe
 class BufferingResponseListener
-        extends Response.Listener.Adapter
+        implements Response.Listener
 {
     private static final long BUFFER_MAX_BYTES = DataSize.of(1, MEGABYTE).toBytes();
     private static final long BUFFER_MIN_BYTES = DataSize.of(1, KILOBYTE).toBytes();

http-client/src/main/java/io/airlift/http/client/jetty/ConnectionPoolDistribution.java

@@ -3,7 +3,7 @@
 import io.airlift.stats.Distribution;
 import org.eclipse.jetty.client.DuplexConnectionPool;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 
 import java.util.Objects;
 

http-client/src/main/java/io/airlift/http/client/jetty/DestinationDistribution.java

@@ -2,7 +2,7 @@
 
 import io.airlift.stats.Distribution;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 
 class DestinationDistribution
         extends CachedDistribution

http-client/src/main/java/io/airlift/http/client/jetty/HttpClientLogger.java

@@ -13,8 +13,8 @@
  */
 package io.airlift.http.client.jetty;
 
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Response;
 
 import java.util.Optional;
 

http-client/src/main/java/io/airlift/http/client/jetty/HttpClientLoggingListener.java

@@ -15,19 +15,18 @@
 
 import io.airlift.http.client.jetty.HttpClientLogger.RequestInfo;
 import io.airlift.http.client.jetty.HttpClientLogger.ResponseInfo;
-import org.eclipse.jetty.client.HttpRequest;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Response;
+import org.eclipse.jetty.client.Result;
+import org.eclipse.jetty.client.transport.HttpRequest;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 
 class HttpClientLoggingListener
-        extends Response.Listener.Adapter
-        implements Request.Listener
+        implements Response.Listener, Request.Listener
 {
     private final HttpClientLogger logger;
     private final long requestTimestampMillis;

http-client/src/main/java/io/airlift/http/client/jetty/HttpRequestEvent.java

@@ -17,8 +17,8 @@
 import io.airlift.http.client.jetty.HttpClientLogger.RequestInfo;
 import io.airlift.http.client.jetty.HttpClientLogger.ResponseInfo;
 import jakarta.annotation.Nullable;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Response;
 import org.eclipse.jetty.http.HttpFields;
 
 import java.time.Instant;