You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/08 08:43:42 UTC

(maven) 01/03: Upgrade it suite to use Jetty 12.1.6 and core jetty api

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 163659d4f06993c025130bef73019a0f7d1a9c90
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Feb 18 21:50:25 2026 +1000

    Upgrade it suite to use Jetty 12.1.6 and core jetty api
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 its/core-it-suite/pom.xml                          |  8 +--
 .../test/java/org/apache/maven/it/HttpServer.java  | 59 +++++----------
 .../it/MavenIT0146InstallerSnapshotNaming.java     |  9 +--
 .../MavenITmng0553SettingsAuthzEncryptionTest.java | 31 ++++----
 .../maven/it/MavenITmng0768OfflineModeTest.java    | 37 +++++-----
 .../it/MavenITmng2305MultipleProxiesTest.java      | 41 ++++++-----
 .../maven/it/MavenITmng2387InactiveProxyTest.java  | 19 ++---
 .../MavenITmng3415JunkRepositoryMetadataTest.java  | 21 +++---
 .../maven/it/MavenITmng3461MirrorMatchingTest.java | 52 +++++++-------
 ...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 50 ++++++-------
 .../it/MavenITmng3652UserAgentHeaderTest.java      | 35 ++++-----
 .../MavenITmng3953AuthenticatedDeploymentTest.java | 50 +++++--------
 .../it/MavenITmng4068AuthenticatedMirrorTest.java  | 34 ++++-----
 ...enITmng4235HttpAuthDeploymentChecksumsTest.java | 82 ++++++++++-----------
 ...4326LocalSnapshotSuppressesRemoteCheckTest.java | 30 ++++----
 ...venITmng4343MissingReleaseUpdatePolicyTest.java | 41 ++++++-----
 ...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 23 +++---
 .../maven/it/MavenITmng4360WebDavSupportTest.java  | 35 +++++----
 ...avenITmng4413MirroringOfDependencyRepoTest.java | 34 ++++-----
 .../it/MavenITmng4428FollowHttpRedirectTest.java   | 43 +++++------
 ...469AuthenticatedDeploymentToCustomRepoTest.java | 50 +++++--------
 ...Tmng4470AuthenticatedDeploymentToProxyTest.java | 83 ++++++++++------------
 ...MavenITmng4489MirroringOfExtensionRepoTest.java | 34 ++++-----
 ...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java | 24 +++----
 ...avenITmng4554PluginPrefixMappingUpdateTest.java | 54 +++++++-------
 ...nITmng4555MetaversionResolutionOfflineTest.java | 18 +++--
 .../MavenITmng4561MirroringOfPluginRepoTest.java   | 34 ++++-----
 ...729MirrorProxyAuthUsedByProjectBuilderTest.java | 33 ++++-----
 ...refixResolutionDoesntTouchDisabledRepoTest.java | 18 +++--
 ...rsionResolutionDoesntTouchDisabledRepoTest.java | 18 +++--
 ...nITmng4781DeploymentToNexusStagingRepoTest.java | 30 ++++----
 .../maven/it/MavenITmng4991NonProxyHostsTest.java  |  9 +--
 .../MavenITmng5064SuppressSnapshotUpdatesTest.java | 27 +++----
 .../maven/it/MavenITmng5175WagonHttpTest.java      | 31 ++++----
 ...g5280SettingsProfilesRepositoriesOrderTest.java | 53 +++++++-------
 ...MavenITmng5868NoDuplicateAttachedArtifacts.java | 26 ++++---
 ...MavenITmng7819FileLockingWithSnapshotsTest.java |  8 +--
 37 files changed, 582 insertions(+), 702 deletions(-)

diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml
index 5871a3570f..233f88d348 100644
--- a/its/core-it-suite/pom.xml
+++ b/its/core-it-suite/pom.xml
@@ -87,7 +87,7 @@ under the License.
     <proxy.user />
     <proxy.pass />
     <proxy.nonProxyHosts>localhost</proxy.nonProxyHosts>
-    <jetty9Version>9.4.57.v20241219</jetty9Version>
+    <jettyVersion>12.1.12</jettyVersion>
 
     <stubPluginVersion>0.1-stub-SNAPSHOT</stubPluginVersion>
     <!-- Support artifacts version - kept separate from Maven version -->
@@ -116,17 +116,17 @@ under the License.
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jetty9Version}</version>
+      <version>${jettyVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${jetty9Version}</version>
+      <version>${jettyVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty9Version}</version>
+      <version>${jettyVersion}</version>
     </dependency>
 
     <dependency>
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
index c5bdffa1fc..7f431ff67d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
@@ -18,36 +18,30 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.log.StdErrLog;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.security.Password;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
 
 /**
  * An HTTP server that handles all requests on a given port from a specified source, optionally secured using BASIC auth
@@ -57,13 +51,6 @@
  * @author Jason van Zyl
  */
 public class HttpServer {
-    static {
-        Log.initialized();
-        Logger rootLogger = Log.getRootLogger();
-        if (rootLogger instanceof StdErrLog) {
-            ((StdErrLog) rootLogger).setLevel(StdErrLog.LEVEL_WARN);
-        }
-    }
 
     private final Server server;
 
@@ -106,7 +93,6 @@ private Server server(int port) {
         threadPool.setMaxThreads(500);
         Server server = new Server(threadPool);
         server.setConnectors(new Connector[] {new ServerConnector(server)});
-        server.addBean(new ScheduledExecutorScheduler());
 
         ServerConnector connector = (ServerConnector) server.getConnectors()[0];
         connector.setIdleTimeout(30_000L);
@@ -121,22 +107,12 @@ private Server server(int port) {
             loginService.setUserStore(userStore);
             server.addBean(loginService);
 
-            ConstraintSecurityHandler security = new ConstraintSecurityHandler();
-            server.setHandler(security);
-
-            Constraint constraint = new Constraint();
-            constraint.setName("auth");
-            constraint.setAuthenticate(true);
-            constraint.setRoles(new String[] {"user", "admin"});
-
-            ConstraintMapping mapping = new ConstraintMapping();
-            mapping.setPathSpec("/*");
-            mapping.setConstraint(constraint);
-
-            security.setConstraintMappings(Collections.singletonList(mapping));
+            SecurityHandler.PathMapped security = new SecurityHandler.PathMapped();
             security.setAuthenticator(new BasicAuthenticator());
             security.setLoginService(loginService);
+            security.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
             security.setHandler(handler);
+            server.setHandler(security);
         } else {
             server.setHandler(handler);
         }
@@ -201,7 +177,7 @@ public interface StreamSource {
         InputStream stream(String path) throws IOException;
     }
 
-    public static class StreamSourceHandler extends AbstractHandler {
+    public static class StreamSourceHandler extends Handler.Abstract {
 
         private final StreamSource source;
 
@@ -210,15 +186,16 @@ public StreamSourceHandler(StreamSource source) {
         }
 
         @Override
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException {
-            response.setContentType("application/octet-stream");
-            response.setStatus(HttpServletResponse.SC_OK);
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            response.getHeaders().put(HttpHeader.CONTENT_TYPE, "application/octet-stream");
+            response.setStatus(200);
+            String target = Request.getPathInContext(request);
             try (InputStream in = source.stream(target.substring(1));
-                    OutputStream out = response.getOutputStream()) {
+                    OutputStream out = Content.Sink.asOutputStream(response)) {
                 in.transferTo(out);
             }
-            baseRequest.setHandled(true);
+            callback.succeeded();
+            return true;
         }
     }
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index 591d7086e4..9fd652bc24 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -27,8 +27,8 @@
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -50,12 +50,13 @@ public MavenIT0146InstallerSnapshotNaming() throws IOException {
 
     @BeforeEach
     protected void setUp() throws Exception {
+        server = new Server(0);
+
         ResourceHandler resourceHandler = new ResourceHandler();
-        resourceHandler.setResourceBase(testDir.resolve("repo").toString());
-        HandlerList handlers = new HandlerList();
+        resourceHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo")));
+        Handler.Sequence handlers = new Handler.Sequence();
         handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
 
-        server = new Server(0);
         server.setHandler(handlers);
         server.start();
         if (server.isFailed()) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index 3eb05b9cdf..95e63e4025 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -23,23 +23,23 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
@@ -60,33 +60,26 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte
     protected void setUp() throws Exception {
         testDir = extractResources("mng-0553");
 
-        Constraint constraint = new Constraint(__BASIC_AUTH, "user");
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.resolve("repo").toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo")));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
         server.start();
         if (server.isFailed()) {
             fail("Couldn't bind the server socket to a free port!");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index 6b31a9c24a..e152993cfa 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
@@ -18,10 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -29,11 +25,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -57,33 +55,34 @@ public void testitMNG768() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        Handler repoHandler = new AbstractHandler() {
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+        Handler repoHandler = new Handler.Abstract() {
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
-                requestedUris.add(request.getRequestURI());
+                String uri = Request.getPathInContext(request);
+                requestedUris.add(uri);
 
-                PrintWriter writer = response.getWriter();
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
 
-                response.setStatus(HttpServletResponse.SC_OK);
+                response.setStatus(200);
 
-                if (request.getRequestURI().endsWith(".pom")) {
+                if (uri.endsWith(".pom")) {
                     writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                     writer.println("  <modelVersion>4.0.0</modelVersion>");
                     writer.println("  <groupId>org.apache.maven.its.mng0768</groupId>");
                     writer.println("  <artifactId>dep</artifactId>");
                     writer.println("  <version>0.1</version>");
                     writer.println("</project>");
-                } else if (request.getRequestURI().endsWith(".jar")) {
+                } else if (uri.endsWith(".jar")) {
                     writer.println("empty");
-                } else if (request.getRequestURI().endsWith(".md5")
-                        || request.getRequestURI().endsWith(".sha1")) {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                } else if (uri.endsWith(".md5") || uri.endsWith(".sha1")) {
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                writer.flush();
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index cecd1ab291..1c30fbd219 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -18,24 +18,23 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.Test;
 
@@ -118,7 +117,8 @@ public void testit() throws Exception {
     }
 
     private void addHttpsConnector(Server server, Path keyStorePath, String keyStorePassword, String keyPassword) {
-        SslContextFactory sslContextFactory = new SslContextFactory(keyStorePath.toString());
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
+        sslContextFactory.setKeyStorePath(keyStorePath.toString());
         sslContextFactory.setKeyStorePassword(keyStorePassword);
         sslContextFactory.setKeyManagerPassword(keyPassword);
         HttpConfiguration httpConfiguration = new HttpConfiguration();
@@ -132,32 +132,35 @@ private void addHttpsConnector(Server server, Path keyStorePath, String keyStore
         server.addConnector(httpsConnector);
     }
 
-    static class RepoHandler extends AbstractHandler {
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException {
-            PrintWriter writer = response.getWriter();
-
-            String uri = request.getRequestURI();
+    static class RepoHandler extends Handler.Abstract {
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            String uri = Request.getPathInContext(request);
+            String scheme = request.getHttpURI().getScheme();
 
-            if (!uri.startsWith("/repo/org/apache/maven/its/mng2305/" + request.getScheme() + "/")) {
+            if (!uri.startsWith("/repo/org/apache/maven/its/mng2305/" + scheme + "/")) {
                 // HTTP connector serves only http-0.1.jar and HTTPS connector serves only https-0.1.jar
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             } else if (uri.endsWith(".pom")) {
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
                 writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                 writer.println("  <modelVersion>4.0.0</modelVersion>");
                 writer.println("  <groupId>org.apache.maven.its.mng2305</groupId>");
-                writer.println("  <artifactId>" + request.getScheme() + "</artifactId>");
+                writer.println("  <artifactId>" + scheme + "</artifactId>");
                 writer.println("  <version>0.1</version>");
                 writer.println("</project>");
-                response.setStatus(HttpServletResponse.SC_OK);
+                writer.flush();
+                response.setStatus(200);
             } else if (uri.endsWith(".jar")) {
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
                 writer.println("empty");
-                response.setStatus(HttpServletResponse.SC_OK);
+                writer.flush();
+                response.setStatus(200);
             } else {
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             }
 
-            ((Request) request).setHandled(true);
+            callback.succeeded();
+            return true;
         }
     }
 }
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index 88ca698e28..761810ecb0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -26,8 +26,8 @@
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -53,13 +53,15 @@ public class MavenITmng2387InactiveProxyTest extends AbstractMavenIntegrationTes
     protected void setUp() throws Exception {
         testDir = extractResources("mng-2387");
 
+        server = new Server(0);
+
         ResourceHandler resourceHandler = new ResourceHandler();
-        resourceHandler.setResourceBase(testDir.resolve("repo").toAbsolutePath().toString());
+        resourceHandler.setBaseResource(
+                ResourceFactory.of(server).newResource(testDir.resolve("repo").toAbsolutePath()));
 
-        HandlerList handlers = new HandlerList();
+        Handler.Sequence handlers = new Handler.Sequence();
         handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
 
-        server = new Server(0);
         server.setHandler(handlers);
         server.start();
         if (server.isFailed()) {
@@ -68,14 +70,15 @@ protected void setUp() throws Exception {
         port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort();
         System.out.println("Bound server socket to the HTTP port " + port);
 
+        proxyServer = new Server(0);
+
         resourceHandler = new ResourceHandler();
-        resourceHandler.setResourceBase(
-                testDir.resolve("proxy").toAbsolutePath().toString());
+        resourceHandler.setBaseResource(ResourceFactory.of(proxyServer)
+                .newResource(testDir.resolve("proxy").toAbsolutePath()));
 
-        handlers = new HandlerList();
+        handlers = new Handler.Sequence();
         handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
 
-        proxyServer = new Server(0);
         proxyServer.setHandler(handlers);
         proxyServer.start();
         if (proxyServer.isFailed()) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index 277f407363..54715d9e12 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -32,8 +29,9 @@
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -164,17 +162,18 @@ public void testShouldNotRepeatedlyUpdateOnResourceNotFoundException() throws Ex
 
         final Deque<String> requestUris = new ConcurrentLinkedDeque<>();
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
-                requestUris.add(request.getRequestURI());
+                requestUris.add(Request.getPathInContext(request));
 
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index 246067ea0b..d7626e03f9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -18,18 +18,17 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
+import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -75,29 +74,34 @@ public void testitExternalWildcard() throws Exception {
 
         Verifier verifier = newVerifier(testDir);
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
-
-                if (request.getRequestURI().endsWith("/b-0.1.jar")) {
-                    response.setStatus(HttpServletResponse.SC_OK);
-                    response.getWriter().println(request.getRequestURI());
-                } else if (request.getRequestURI().endsWith("/b-0.1.pom")) {
-                    response.setStatus(HttpServletResponse.SC_OK);
-                    response.getWriter().println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
-                    response.getWriter().println("  <modelVersion>4.0.0</modelVersion>");
-                    response.getWriter().println("  <groupId>org.apache.maven.its.mng3461</groupId>");
-                    response.getWriter().println("  <artifactId>b</artifactId>");
-                    response.getWriter().println("  <version>0.1</version>");
-                    response.getWriter().println("</project>");
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
+
+                String uri = Request.getPathInContext(request);
+                if (uri.endsWith("/b-0.1.jar")) {
+                    response.setStatus(200);
+                    PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
+                    writer.println(uri);
+                    writer.flush();
+                } else if (uri.endsWith("/b-0.1.pom")) {
+                    response.setStatus(200);
+                    PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
+                    writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
+                    writer.println("  <modelVersion>4.0.0</modelVersion>");
+                    writer.println("  <groupId>org.apache.maven.its.mng3461</groupId>");
+                    writer.println("  <artifactId>b</artifactId>");
+                    writer.println("  <version>0.1</version>");
+                    writer.println("</project>");
+                    writer.flush();
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 19010c2841..8410d052e6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -18,19 +18,19 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.codehaus.plexus.util.StringUtils;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,22 +61,22 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test extends AbstractMavenInt
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler handler = new AbstractHandler() {
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Got request for URL: '" + request.getRequestURL() + "'");
+        Handler handler = new Handler.Abstract() {
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println(
+                        "Got request for URL: '" + request.getHttpURI().toString() + "'");
                 System.out.flush();
 
-                response.setContentType("text/plain");
+                response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
 
                 System.out.println("Checking for 'Proxy-Connection' header...");
-                if (request.getHeader("Proxy-Connection") != null) {
-                    response.setStatus(HttpServletResponse.SC_OK);
-                    if (request.getRequestURI().endsWith(".sha1")) {
-                        response.getWriter().print(CONTENT_CHECKSUM_SHA1);
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
+                if (request.getHeaders().get("Proxy-Connection") != null) {
+                    response.setStatus(200);
+                    if (Request.getPathInContext(request).endsWith(".sha1")) {
+                        writer.print(CONTENT_CHECKSUM_SHA1);
                     } else {
-                        response.getWriter().print(CONTENT);
+                        writer.print(CONTENT);
                     }
 
                     System.out.println("Proxy-Connection found.");
@@ -87,24 +87,26 @@ public void handle(
                  * Changing the code to test for more generalized case: local proxy receives a request with
                  * correct server url and resource uri
                  */
-                else if (request.getRequestURI().startsWith("/org/apache/maven/its/mng3599/test-dependency")
-                        && request.getRequestURL().toString().startsWith("http://www.example.com")) {
-                    response.setStatus(HttpServletResponse.SC_OK);
-                    if (request.getRequestURI().endsWith(".sha1")) {
-                        response.getWriter().print(CONTENT_CHECKSUM_SHA1);
+                else if (Request.getPathInContext(request).startsWith("/org/apache/maven/its/mng3599/test-dependency")
+                        && request.getHttpURI().toString().startsWith("http://www.example.com")) {
+                    response.setStatus(200);
+                    if (Request.getPathInContext(request).endsWith(".sha1")) {
+                        writer.print(CONTENT_CHECKSUM_SHA1);
                     } else {
-                        response.getWriter().print(CONTENT);
+                        writer.print(CONTENT);
                     }
 
                     System.out.println(
                             "Correct proxied request 'http://www.example.com' for resource '/org/apache/maven/its/mng3599/test-dependency' found.");
                 } else {
-                    response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                    response.setStatus(400);
 
                     System.out.println("Proxy-Connection not found.");
                 }
+                writer.flush();
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index b60ca43326..d73315c397 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -18,19 +18,19 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -56,25 +56,26 @@ class MavenITmng3652UserAgentHeaderTest extends AbstractMavenIntegrationTestCase
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler handler = new AbstractHandler() {
+        Handler handler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Handling URL: '" + request.getRequestURL() + "'");
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling URL: '" + request.getHttpURI().toString() + "'");
 
-                userAgent = request.getHeader("User-Agent");
+                userAgent = request.getHeaders().get("User-Agent");
 
-                customHeader = request.getHeader("Custom-Header");
+                customHeader = request.getHeaders().get("Custom-Header");
 
                 System.out.println("Got User-Agent: '" + userAgent + "'");
 
-                response.setContentType("text/plain");
-                response.setStatus(HttpServletResponse.SC_OK);
-                response.getWriter().println("some content");
-                response.getWriter().println();
+                response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
+                response.setStatus(200);
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
+                writer.println("some content");
+                writer.println();
+                writer.flush();
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
index ac58e3744b..7d9a8c1781 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
@@ -18,28 +18,24 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -57,48 +53,36 @@ public class MavenITmng3953AuthenticatedDeploymentTest extends AbstractMavenInte
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) {
+                System.out.println("Handling " + request.getMethod() + " " + request.getHttpURI());
 
                 if ("PUT".equalsIgnoreCase(request.getMethod())) {
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     deployed = true;
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"deployer"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"deployer"});
         userRealm.setUserStore(userStore);
 
         server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
-
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
-        handlerList.addHandler(repoHandler);
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(repoHandler);
+        server.setHandler(securityHandler);
         server.start();
         if (server.isFailed()) {
             fail("Couldn't bind the server socket to a free port!");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index 5ec9aae5b4..47f4cd688f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -22,23 +22,22 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
-
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4068">MNG-4068</a>.
  *
@@ -57,35 +56,26 @@ public class MavenITmng4068AuthenticatedMirrorTest extends AbstractMavenIntegrat
     protected void setUp() throws Exception {
         testDir = extractResources("mng-4068");
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"user"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.resolve("repo").toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo")));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
         server.start();
         if (server.isFailed()) {
             fail("Couldn't bind the server socket to a free port!");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
index b6d766527d..fed7b31e8a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
@@ -18,11 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Deque;
@@ -32,25 +27,25 @@
 
 import org.apache.maven.it.utils.DeployedResource;
 import org.codehaus.plexus.util.StringUtils;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -72,34 +67,30 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest extends AbstractMaven
     protected void setUp() throws Exception {
         testDir = extractResources("mng-4235");
 
-        repoHandler.setResourceBase(testDir.toString());
-
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"deployer"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
+        repoHandler.setBasePath(testDir);
 
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testpass"), new String[] {"deployer"});
         userRealm.setUserStore(userStore);
 
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
+
+        server = new Server(0);
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        ResourceHandler resourceHandler = new ResourceHandler();
+        resourceHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
+
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
+        handlerList.addHandler(resourceHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server = new Server(0);
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
         server.start();
         if (server.isFailed()) {
             fail("Couldn't bind the server socket to a free port!");
@@ -165,40 +156,45 @@ private void assertHash(Verifier verifier, String dataFile, String hashExt, Stri
         assertTrue(expectedHash.equalsIgnoreCase(actualHash), "expected=" + expectedHash + ", actual=" + actualHash);
     }
 
-    private static class RepoHandler extends ResourceHandler {
+    private static class RepoHandler extends Handler.Abstract {
         private final Deque<DeployedResource> deployedResources = new ConcurrentLinkedDeque<>();
+        private Path basePath;
+
+        void setBasePath(Path basePath) {
+            this.basePath = basePath;
+        }
 
         @Override
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException {
-            System.out.println(request.getMethod() + " " + request.getRequestURI());
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            System.out.println(request.getMethod() + " " + Request.getPathInContext(request));
 
             if ("PUT".equals(request.getMethod())) {
-                Resource resource = getResource(request.getPathInfo());
+                Path resource =
+                        basePath.resolve(Request.getPathInContext(request).substring(1));
 
                 // NOTE: This can get called concurrently but File.mkdirs() isn't thread-safe in all JREs
-                Path dir = resource.getFile().toPath().getParent();
+                Path dir = resource.getParent();
                 for (int i = 0; i < 10 && !Files.exists(dir); i++) {
                     Files.createDirectories(dir);
                 }
 
-                Files.copy(request.getInputStream(), resource.getFile().toPath(), REPLACE_EXISTING);
+                Files.copy(Request.asInputStream(request), resource, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
 
                 DeployedResource deployedResource = new DeployedResource();
 
                 deployedResource.httpMethod = request.getMethod();
-                deployedResource.requestUri = request.getRequestURI();
-                deployedResource.transferEncoding = request.getHeader("Transfer-Encoding");
-                deployedResource.contentLength = request.getHeader("Content-Length");
+                deployedResource.requestUri = Request.getPathInContext(request);
+                deployedResource.transferEncoding = request.getHeaders().get("Transfer-Encoding");
+                deployedResource.contentLength = request.getHeaders().get("Content-Length");
 
                 deployedResources.add(deployedResource);
 
-                response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+                response.setStatus(204);
 
-                ((Request) request).setHandled(true);
-            } else {
-                super.handle(target, baseRequest, request, response);
+                callback.succeeded();
+                return true;
             }
+            return false;
         }
     }
 }
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
index 2bbb029edc..e43cb75459 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
@@ -18,10 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.Date;
@@ -30,11 +26,13 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -68,14 +66,12 @@ public void testit() throws Exception {
 
         final Deque<String> uris = new ConcurrentLinkedDeque<>();
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                PrintWriter writer = response.getWriter();
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
 
-                String uri = request.getRequestURI();
+                String uri = Request.getPathInContext(request);
 
                 if (uri.startsWith("/repo/org/apache/maven/its/mng4326")
                         && !uri.endsWith(".md5")
@@ -88,7 +84,7 @@ public void handle(
                     fmt.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
                     String now = fmt.format(new Date(System.currentTimeMillis() + 3000));
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     writer.println("<metadata>");
                     writer.println("  <groupId>org.apache.maven.its.mng4326</groupId>");
                     writer.println("  <artifactId>dep</artifactId>");
@@ -102,7 +98,7 @@ public void handle(
                     writer.println("  </versioning>");
                     writer.println("</metadata>");
                 } else if (uri.endsWith(".pom")) {
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                     writer.println("  <modelVersion>4.0.0</modelVersion>");
                     writer.println("  <groupId>org.apache.maven.its.mng4326</groupId>");
@@ -110,13 +106,15 @@ public void handle(
                     writer.println("  <version>0.1-SNAPSHOT</version>");
                     writer.println("</project>");
                 } else if (uri.endsWith(".jar")) {
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     writer.println("empty");
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                writer.flush();
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
index 1dadf3ff7c..19a2513fc9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.Deque;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -56,40 +54,41 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest extends AbstractMavenI
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
-                if (request.getRequestURI().startsWith("/org/apache/maven/its/mng4343")) {
-                    requestedUris.add(request.getRequestURI().substring(29));
+                String uri = Request.getPathInContext(request);
+                if (uri.startsWith("/org/apache/maven/its/mng4343")) {
+                    requestedUris.add(uri.substring(29));
                 }
 
                 if (blockAccess) {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 } else {
-                    PrintWriter writer = response.getWriter();
+                    PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
 
-                    if (request.getRequestURI().endsWith(".pom")) {
+                    if (uri.endsWith(".pom")) {
                         writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                         writer.println("  <modelVersion>4.0.0</modelVersion>");
                         writer.println("  <groupId>org.apache.maven.its.mng4343</groupId>");
                         writer.println("  <artifactId>dep</artifactId>");
                         writer.println("  <version>0.1</version>");
                         writer.println("</project>");
-                    } else if (request.getRequestURI().endsWith(".jar")) {
+                    } else if (uri.endsWith(".jar")) {
                         writer.println("empty");
-                    } else if (request.getRequestURI().endsWith(".md5")
-                            || request.getRequestURI().endsWith(".sha1")) {
-                        response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    } else if (uri.endsWith(".md5") || uri.endsWith(".sha1")) {
+                        response.setStatus(404);
                     }
+                    writer.flush();
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
index ade852af1f..d7a750b2f1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,8 +27,9 @@
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -58,20 +56,21 @@ public void testit() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
                 // NOTE: Old Maven versions use the test repo also to check for plugin updates so we need to filter
-                if (request.getRequestURI().startsWith("/org/apache/maven/its/mng4348")) {
-                    requestedUris.add(request.getRequestURI());
+                if (Request.getPathInContext(request).startsWith("/org/apache/maven/its/mng4348")) {
+                    requestedUris.add(Request.getPathInContext(request));
                 }
 
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
index 07c13a0a34..84de0b6c89 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
@@ -18,20 +18,18 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -73,32 +71,33 @@ private void test(String project) throws Exception {
 
         Verifier verifier = newVerifier(testDir);
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
-                PrintWriter writer = response.getWriter();
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
 
-                response.setStatus(HttpServletResponse.SC_OK);
+                response.setStatus(200);
 
-                if (request.getRequestURI().endsWith(".pom")) {
+                if (Request.getPathInContext(request).endsWith(".pom")) {
                     writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                     writer.println("  <modelVersion>4.0.0</modelVersion>");
                     writer.println("  <groupId>org.apache.maven.its.mng4360</groupId>");
                     writer.println("  <artifactId>dep</artifactId>");
                     writer.println("  <version>0.1</version>");
                     writer.println("</project>");
-                } else if (request.getRequestURI().endsWith(".jar")) {
+                } else if (Request.getPathInContext(request).endsWith(".jar")) {
                     writer.println("empty");
-                } else if (request.getRequestURI().endsWith(".md5")
-                        || request.getRequestURI().endsWith(".sha1")) {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                } else if (Request.getPathInContext(request).endsWith(".md5")
+                        || Request.getPathInContext(request).endsWith(".sha1")) {
+                    response.setStatus(404);
                 }
+                writer.flush();
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
index e7f187e7b0..0c94b0f992 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
@@ -21,21 +21,20 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
-
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4413">MNG-4413</a>.
  *
@@ -53,35 +52,26 @@ public class MavenITmng4413MirroringOfDependencyRepoTest extends AbstractMavenIn
     public void testit() throws Exception {
         Path testDir = extractResources("mng-4413");
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"user"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         Server server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.resolve("repo-a").toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo-a")));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
 
         try {
             server.start();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index 1d33e2a3e3..b5fe46b5f1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -18,25 +18,24 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.Test;
 
@@ -139,7 +138,8 @@ private void testit(boolean fromHttp, boolean toHttp, boolean relativeLocation)
     }
 
     private void addHttpsConnector(Server server, String keyStorePath, String keyStorePassword, String keyPassword) {
-        SslContextFactory sslContextFactory = new SslContextFactory(keyStorePath);
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
+        sslContextFactory.setKeyStorePath(keyStorePath);
         sslContextFactory.setKeyStorePassword(keyStorePassword);
         sslContextFactory.setKeyManagerPassword(keyPassword);
         HttpConfiguration httpConfiguration = new HttpConfiguration();
@@ -153,7 +153,7 @@ private void addHttpsConnector(Server server, String keyStorePath, String keySto
         server.addConnector(httpsConnector);
     }
 
-    static class RedirectHandler extends AbstractHandler {
+    static class RedirectHandler extends Handler.Abstract {
         private final String protocol;
 
         private final NetworkConnector connector;
@@ -163,40 +163,43 @@ static class RedirectHandler extends AbstractHandler {
             this.connector = connector;
         }
 
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException {
-            System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
-
-            PrintWriter writer = response.getWriter();
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            System.out.println("Handling " + request.getMethod() + " "
+                    + request.getHttpURI().toString());
 
-            String uri = request.getRequestURI();
+            String uri = Request.getPathInContext(request);
             if (uri.startsWith("/repo/")) {
                 String location = "/redirected/" + uri.substring(6);
                 if (protocol != null && connector != null) {
                     location = protocol + "://localhost:" + connector.getLocalPort() + location;
                 }
                 if (uri.endsWith(".pom")) {
-                    response.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
+                    response.setStatus(302);
                 } else {
-                    response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
+                    response.setStatus(301);
                 }
-                response.setHeader("Location", location);
+                response.getHeaders().put("Location", location);
             } else if (uri.endsWith(".pom")) {
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
                 writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
                 writer.println("  <modelVersion>4.0.0</modelVersion>");
                 writer.println("  <groupId>org.apache.maven.its.mng4428</groupId>");
                 writer.println("  <artifactId>dep</artifactId>");
                 writer.println("  <version>0.1</version>");
                 writer.println("</project>");
-                response.setStatus(HttpServletResponse.SC_OK);
+                writer.flush();
+                response.setStatus(200);
             } else if (uri.endsWith(".jar")) {
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
                 writer.println("empty");
-                response.setStatus(HttpServletResponse.SC_OK);
+                writer.flush();
+                response.setStatus(200);
             } else {
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             }
 
-            ((Request) request).setHandled(true);
+            callback.succeeded();
+            return true;
         }
     }
 }
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index f39a133548..2fa3ea1e88 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
@@ -18,28 +18,24 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -57,48 +53,36 @@ public class MavenITmng4469AuthenticatedDeploymentToCustomRepoTest extends Abstr
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) {
+                System.out.println("Handling " + request.getMethod() + " " + request.getHttpURI());
 
                 if ("PUT".equalsIgnoreCase(request.getMethod())) {
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     deployed = true;
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"deployer"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"deployer"});
         userRealm.setUserStore(userStore);
 
         server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
-
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
-        handlerList.addHandler(repoHandler);
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(repoHandler);
+        server.setHandler(securityHandler);
         server.start();
         if (server.isFailed()) {
             fail("Couldn't bind the server socket to a free port!");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
index 4452b63c27..a48fbb4703 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
@@ -30,23 +27,22 @@
 
 import org.apache.maven.it.utils.DeployedResource;
 import org.codehaus.plexus.util.StringUtils;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -66,14 +62,13 @@ public class MavenITmng4470AuthenticatedDeploymentToProxyTest extends AbstractMa
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler proxyHandler = new AbstractHandler() {
+        Handler proxyHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
+            public boolean handle(Request request, Response response, Callback callback) {
                 String tn = Thread.currentThread().getName();
-                System.out.println(tn + " Handling (proxy) " + request.getMethod() + " " + request.getRequestURL());
+                System.out.println(tn + " Handling (proxy) " + request.getMethod() + " " + request.getHttpURI());
 
-                String auth = request.getHeader("Proxy-Authorization");
+                String auth = request.getHeaders().get("Proxy-Authorization");
                 if (auth != null) {
                     auth = auth.substring(auth.indexOf(' ') + 1).trim();
                     auth = new String(Base64.getDecoder().decode(auth), StandardCharsets.US_ASCII);
@@ -81,75 +76,69 @@ public void handle(
                 System.out.println(tn + " Proxy-Authorization: " + auth);
 
                 if (!"proxyuser:proxypass".equals(auth)) {
-                    response.setStatus(HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED);
-                    response.addHeader("Proxy-Authenticate", "Basic realm=\"Squid proxy-caching web server\"");
-                    ((Request) request).setHandled(true);
+                    response.setStatus(407);
+                    response.getHeaders().add("Proxy-Authenticate", "Basic realm=\"Squid proxy-caching web server\"");
+                    callback.succeeded();
+                    return true;
                 }
 
                 DeployedResource deployedResource = new DeployedResource();
 
                 deployedResource.httpMethod = request.getMethod();
-                deployedResource.requestUri = request.getRequestURI();
-                deployedResource.transferEncoding = request.getHeader("Transfer-Encoding");
-                deployedResource.contentLength = request.getHeader("Content-Length");
+                deployedResource.requestUri = Request.getPathInContext(request);
+                deployedResource.transferEncoding = request.getHeaders().get("Transfer-Encoding");
+                deployedResource.contentLength = request.getHeaders().get("Content-Length");
 
                 deployedResources.add(deployedResource);
-                System.out.println(tn + " Done (proxy) " + request.getMethod() + " " + request.getRequestURL());
+                System.out.println(tn + " Done (proxy) " + request.getMethod() + " " + request.getHttpURI());
+                return false;
             }
         };
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
+            public boolean handle(Request request, Response response, Callback callback) {
                 String tn = Thread.currentThread().getName();
-                System.out.println(tn + " Handling (repos) " + request.getMethod() + " " + request.getRequestURL());
+                System.out.println(tn + " Handling (repos) " + request.getMethod() + " " + request.getHttpURI());
 
                 if ("PUT".equalsIgnoreCase(request.getMethod())) {
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     deployed = true;
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
-
                 DeployedResource deployedResource = new DeployedResource();
 
                 deployedResource.httpMethod = request.getMethod();
-                deployedResource.requestUri = request.getRequestURI();
-                deployedResource.transferEncoding = request.getHeader("Transfer-Encoding");
-                deployedResource.contentLength = request.getHeader("Content-Length");
+                deployedResource.requestUri = Request.getPathInContext(request);
+                deployedResource.transferEncoding = request.getHeaders().get("Transfer-Encoding");
+                deployedResource.contentLength = request.getHeaders().get("Content-Length");
 
                 deployedResources.add(deployedResource);
-                System.out.println(tn + " Done (repos) " + request.getMethod() + " " + request.getRequestURL());
+                System.out.println(tn + " Done (repos) " + request.getMethod() + " " + request.getHttpURI());
+
+                callback.succeeded();
+                return true;
             }
         };
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"deployer"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"deployer"});
         userRealm.setUserStore(userStore);
 
         server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
+
+        securityHandler.setHandler(repoHandler);
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(proxyHandler);
         handlerList.addHandler(securityHandler);
-        handlerList.addHandler(repoHandler);
 
         server.setHandler(handlerList);
         server.start();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
index 240cf4be71..30a427a37d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
@@ -21,21 +21,20 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
-
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4489">MNG-4489</a>.
  *
@@ -53,35 +52,26 @@ public class MavenITmng4489MirroringOfExtensionRepoTest extends AbstractMavenInt
     public void testit() throws Exception {
         Path testDir = extractResources("mng-4489");
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"user"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         Server server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
 
         try {
             server.start();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
index 3625f8c0a8..2d23ae165d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
@@ -18,22 +18,21 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -61,23 +60,24 @@ public void testit() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
+        Server server = new Server(0);
+
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        Server server = new Server(0);
         server.setHandler(handlerList);
 
         Verifier verifier = newVerifier(testDir);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index 6cc6832f05..fdd62682ed 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -29,13 +26,15 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -62,23 +61,24 @@ public void testitCached() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
+        Server server = new Server(0);
+
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        Server server = new Server(0);
         server.setHandler(handlerList);
         server.start();
 
@@ -140,23 +140,24 @@ public void testitForcedUpdate() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
+        Server server = new Server(0);
+
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        Server server = new Server(0);
         server.setHandler(handlerList);
         server.start();
 
@@ -221,23 +222,24 @@ public void testitRefetched() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
+        Server server = new Server(0);
+
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        Server server = new Server(0);
         server.setHandler(handlerList);
         server.start();
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
index ad5afdadac..e63f20f1b4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.Deque;
 import java.util.Map;
@@ -29,8 +26,9 @@
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -53,18 +51,18 @@ public void testit() throws Exception {
 
         final Deque<String> uris = new ConcurrentLinkedDeque<>();
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                String uri = request.getRequestURI();
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                String uri = Request.getPathInContext(request);
 
                 if (uri.startsWith("/repo/org/apache/maven/its/mng4555")) {
                     uris.add(uri.substring(34));
                 }
 
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-                ((Request) request).setHandled(true);
+                response.setStatus(404);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
index 3ea94f31ca..244b6a3007 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
@@ -21,21 +21,20 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
-
 /**
  * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4561">MNG-4561</a>.
  *
@@ -53,35 +52,26 @@ public class MavenITmng4561MirroringOfPluginRepoTest extends AbstractMavenIntegr
     public void testit() throws Exception {
         Path testDir = extractResources("mng-4561");
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"user"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         Server server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
         server.start();
 
         Verifier verifier = newVerifier(testDir);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
index beaaa76941..ff954060ba 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
@@ -22,20 +22,20 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.Constraint;
 import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
 import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.security.Password;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -55,35 +55,26 @@ public class MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest extends Abstr
     public void testit() throws Exception {
         Path testDir = extractResources("mng-4729");
 
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[] {"user"});
-        constraint.setAuthenticate(true);
-
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec("/*");
-
         HashLoginService userRealm = new HashLoginService("TestRealm");
         UserStore userStore = new UserStore();
         userStore.addUser("testuser", new Password("testtest"), new String[] {"user"});
         userRealm.setUserStore(userStore);
 
         Server server = new Server(0);
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        SecurityHandler.PathMapped securityHandler = new SecurityHandler.PathMapped();
         securityHandler.setLoginService(userRealm);
-        securityHandler.setAuthMethod(__BASIC_AUTH);
-        securityHandler.setConstraintMappings(new ConstraintMapping[] {constraintMapping});
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.put("/*", Constraint.from("auth", Constraint.Authorization.ANY_USER));
 
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
-        handlerList.addHandler(securityHandler);
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        server.setHandler(handlerList);
+        securityHandler.setHandler(handlerList);
+        server.setHandler(securityHandler);
         server.start();
 
         Verifier verifier = newVerifier(testDir);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
index ff28fa5dd4..ee0317dba4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
@@ -18,20 +18,18 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.Deque;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -55,15 +53,15 @@ public void testit() throws Exception {
 
         final Deque<String> requestedUris = new ConcurrentLinkedDeque<>();
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(new DefaultHandler());
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
index 6a25c16add..a7bb696159 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -56,15 +54,15 @@ public void testit() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                requestedUris.add(request.getRequestURI());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                requestedUris.add(Request.getPathInContext(request));
+                return false;
             }
         };
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(new DefaultHandler());
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
index 8bd6c4e491..a60ca3a1da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.Deque;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -28,9 +25,9 @@
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -53,30 +50,31 @@ public class MavenITmng4781DeploymentToNexusStagingRepoTest extends AbstractMave
 
     @BeforeEach
     public void setUp() throws Exception {
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             private volatile boolean putSeen;
 
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
                 if ("PUT".equalsIgnoreCase(request.getMethod())) {
-                    response.setStatus(HttpServletResponse.SC_CREATED);
-                    deployedUris.add(request.getRequestURI());
+                    response.setStatus(201);
+                    deployedUris.add(Request.getPathInContext(request));
                     putSeen = true;
                 } else if (!putSeen) {
-                    response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                    response.setStatus(400);
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-                    requestedUris.add(request.getRequestURI());
+                    response.setStatus(404);
+                    requestedUris.add(Request.getPathInContext(request));
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
 
         server = new Server(0);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
index 05f52eef7f..1ff2b460bc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
@@ -27,8 +27,8 @@
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -49,13 +49,14 @@ public class MavenITmng4991NonProxyHostsTest extends AbstractMavenIntegrationTes
     public void testit() throws Exception {
         Path testDir = extractResources("mng-4991");
 
+        Server server = new Server(0);
+
         ResourceHandler resourceHandler = new ResourceHandler();
-        resourceHandler.setResourceBase(testDir.resolve("repo").toString());
+        resourceHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo")));
 
-        HandlerList handlers = new HandlerList();
+        Handler.Sequence handlers = new Handler.Sequence();
         handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
 
-        Server server = new Server(0);
         server.setHandler(handlers);
 
         /*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
index 7c57634c54..8dfe09c540 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
@@ -18,22 +18,21 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -60,25 +59,27 @@ public void testit() throws Exception {
 
         final List<String> requestedUris = Collections.synchronizedList(new ArrayList<>());
 
-        AbstractHandler logHandler = new AbstractHandler() {
+        Handler.Abstract logHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                if (request.getRequestURI().startsWith("/repo/")) {
-                    requestedUris.add(request.getRequestURI().substring(6));
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                String uri = Request.getPathInContext(request);
+                if (uri.startsWith("/repo/")) {
+                    requestedUris.add(uri.substring(6));
                 }
+                return false;
             }
         };
 
+        Server server = new Server(0);
+
         ResourceHandler repoHandler = new ResourceHandler();
-        repoHandler.setResourceBase(testDir.toString());
+        repoHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir));
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(logHandler);
         handlerList.addHandler(repoHandler);
         handlerList.addHandler(new DefaultHandler());
 
-        Server server = new Server(0);
         server.setHandler(handlerList);
         server.start();
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index 57be8426ce..6bf4c69104 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
@@ -18,20 +18,20 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -51,23 +51,24 @@ public class MavenITmng5175WagonHttpTest extends AbstractMavenIntegrationTestCas
 
     @BeforeEach
     protected void setUp() throws Exception {
-        Handler handler = new AbstractHandler() {
+        Handler handler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                    throws IOException, ServletException {
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
                 try {
                     // wait long enough for read timeout to happen in client
                     Thread.sleep(100);
                 } catch (InterruptedException e) {
-                    throw new ServletException(e.getMessage());
+                    throw new IOException(e.getMessage());
                 }
-                response.setContentType("text/plain");
-                response.setStatus(HttpServletResponse.SC_OK);
-                response.getWriter().println("some content");
-                response.getWriter().println();
+                response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
+                response.setStatus(200);
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
+                writer.println("some content");
+                writer.println();
+                writer.flush();
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
index 0eab7ef240..744524ca3a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -29,10 +26,13 @@
 import java.nio.file.Path;
 import java.util.Map;
 
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -131,17 +131,16 @@ public void testPluginRepositoriesOrder() throws Exception {
         assertTrue(pluginRepoHandler.pluginRequestedFromRepo1Last);
     }
 
-    private static final class RepoHandler extends AbstractHandler {
+    private static final class RepoHandler extends Handler.Abstract {
         private volatile boolean artifactRequestedFromRepo1Last;
 
         private volatile boolean artifactRequestedFromRepo2;
 
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException {
-            String uri = request.getRequestURI();
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            String uri = Request.getPathInContext(request);
 
             if (uri.startsWith("/repo1/org/apache/maven/its/mng5280/fake-artifact/1.0/")) {
-                PrintWriter writer = response.getWriter();
+                PrintWriter writer = new PrintWriter(Content.Sink.asOutputStream(response));
 
                 if (uri.endsWith(".pom")) {
                     writer.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\">");
@@ -151,68 +150,70 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
                     writer.println("  <version>1.0</version>");
                     writer.println("</project>");
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                 } else if (uri.endsWith(".jar")) {
                     writer.println("empty");
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     artifactRequestedFromRepo1Last = true;
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
+                writer.flush();
             } else if (uri.startsWith("/repo2/org/apache/maven/its/mng5280/fake-artifact/1.0/")) {
                 if (uri.endsWith(".jar")) {
                     artifactRequestedFromRepo1Last = false;
                     artifactRequestedFromRepo2 = true;
                 }
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             } else {
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             }
 
-            ((Request) request).setHandled(true);
+            callback.succeeded();
+            return true;
         }
     }
 
-    private class PluginRepoHandler extends AbstractHandler {
+    private class PluginRepoHandler extends Handler.Abstract {
         private volatile boolean pluginRequestedFromRepo1Last;
 
         private volatile boolean pluginRequestedFromRepo2;
 
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException {
-            String uri = request.getRequestURI();
+        public boolean handle(Request request, Response response, Callback callback) throws Exception {
+            String uri = Request.getPathInContext(request);
 
             if (uri.startsWith("/pluginRepo1/org/apache/maven/its/mng5280/fake-maven-plugin/1.0/")) {
-                OutputStream outStream = response.getOutputStream();
+                OutputStream outStream = Content.Sink.asOutputStream(response);
 
                 if (uri.endsWith(".pom")) {
                     Path pluginPom = testDir.resolve("fake-maven-plugin/fake-maven-plugin-1.0.pom");
                     InputStream inStream = Files.newInputStream(pluginPom);
                     copy(inStream, outStream);
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                 } else if (uri.endsWith(".jar")) {
                     Path pluginJar = testDir.resolve("fake-maven-plugin/fake-maven-plugin-1.0.jar");
                     InputStream inStream = Files.newInputStream(pluginJar);
                     copy(inStream, outStream);
 
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                     pluginRequestedFromRepo1Last = true;
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
             } else if (uri.startsWith("/pluginRepo2/org/apache/maven/its/mng5280/fake-maven-plugin/1.0/")) {
                 if (uri.endsWith(".jar")) {
                     pluginRequestedFromRepo1Last = false;
                     pluginRequestedFromRepo2 = true;
                 }
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             } else {
-                response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                response.setStatus(404);
             }
 
-            ((Request) request).setHandled(true);
+            callback.succeeded();
+            return true;
         }
 
         private long copy(InputStream input, OutputStream output) throws IOException {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
index d29e0cf799..eeeda4fdb1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java
@@ -18,18 +18,15 @@
  */
 package org.apache.maven.it;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.util.Callback;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -55,30 +52,31 @@ public class MavenITmng5868NoDuplicateAttachedArtifacts extends AbstractMavenInt
     protected void setUp() throws Exception {
         testDir = extractResources("mng-5868");
 
-        Handler repoHandler = new AbstractHandler() {
+        Handler repoHandler = new Handler.Abstract() {
             @Override
-            public void handle(
-                    String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) {
-                System.out.println("Handling " + request.getMethod() + " " + request.getRequestURL());
+            public boolean handle(Request request, Response response, Callback callback) throws Exception {
+                System.out.println("Handling " + request.getMethod() + " "
+                        + request.getHttpURI().toString());
 
                 if ("PUT".equalsIgnoreCase(request.getMethod())) {
-                    String uri = request.getRequestURI();
+                    String uri = Request.getPathInContext(request);
                     if (uri.startsWith("/repo/org/apache/maven/its/mng5868/mng5868/1.0-SNAPSHOT/mng5868-1.0")
                             && uri.endsWith("-run.jar")) {
                         deployedJarArtifactNumber++;
                     }
-                    response.setStatus(HttpServletResponse.SC_OK);
+                    response.setStatus(200);
                 } else {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    response.setStatus(404);
                 }
 
-                ((Request) request).setHandled(true);
+                callback.succeeded();
+                return true;
             }
         };
 
         server = new Server(0);
 
-        HandlerList handlerList = new HandlerList();
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.addHandler(repoHandler);
 
         server.setHandler(handlerList);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java
index 0636d69bdd..36df96ce13 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java
@@ -25,8 +25,8 @@
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -48,9 +48,9 @@ protected void setUp() throws Exception {
         server = new Server(0);
         ResourceHandler resourceHandler = new ResourceHandler();
         resourceHandler.setWelcomeFiles(new String[] {"index.html"});
-        resourceHandler.setDirectoriesListed(true);
-        resourceHandler.setResourceBase(testDir.resolve("repo").toString());
-        HandlerList handlerList = new HandlerList();
+        resourceHandler.setDirAllowed(true);
+        resourceHandler.setBaseResource(ResourceFactory.of(server).newResource(testDir.resolve("repo")));
+        Handler.Sequence handlerList = new Handler.Sequence();
         handlerList.setHandlers(new Handler[] {resourceHandler});
         server.setHandler(handlerList);
         server.start();