--- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
@@ -11,14 +11,15 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
  org.eclipse.debug.core,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.eclipse.jetty.http;bundle-version="[7,9)",
+ org.eclipse.jetty.security;bundle-version="[7,9)",
+ org.eclipse.jetty.server;bundle-version="[7,9)",
+ org.eclipse.jetty.util;bundle-version="[7,9)",
+ javax.servlet-api;bundle-version=3.1.0
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7,
  JavaSE-1.8
-Bundle-ClassPath: .,
- jars/javax.servlet_2.5.0.v201103041518.jar,
- jars/org.mortbay.jetty.server_6.1.23.v201012071420.jar,
- jars/org.mortbay.jetty.util_6.1.23.v201012071420.jar
 Bundle-Vendor: %Bundle-Vendor
 MavenArtifact-GroupId: org.eclipse.m2e
 MavenArtifact-ArtifactId: org.eclipse.m2e.tests.common
diff --git org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
index 5851e7e..411ea74 100644
--- org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
+++ org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/HttpServer.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *      Sonatype, Inc. - initial API and implementation
+ *      Red Hat, Inc. - ported to Jetty 8
  *******************************************************************************/
 
 package org.eclipse.m2e.tests.common;
@@ -28,23 +29,24 @@ import java.util.TreeMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.HttpMethods;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerList;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.B64Code;
-import org.mortbay.jetty.security.Constraint;
-import org.mortbay.jetty.security.ConstraintMapping;
-import org.mortbay.jetty.security.HashUserRealm;
-import org.mortbay.jetty.security.SecurityHandler;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.util.IO;
-import org.mortbay.util.URIUtil;
+import org.eclipse.jetty.http.HttpMethods;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+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.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.util.B64Code;
+import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.URIUtil;
+import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.security.Password;
 
 
 /**
@@ -260,12 +262,12 @@ public class HttpServer {
 
   protected Handler newProxyHandler() {
     return new AbstractHandler() {
-      public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
+      public void handle(String target, Request unused, HttpServletRequest request, HttpServletResponse response)
           throws IOException {
         String auth = request.getHeader("Proxy-Authorization");
         if(auth != null) {
           auth = auth.substring(auth.indexOf(' ') + 1).trim();
-          auth = B64Code.decode(auth);
+          auth = new String(B64Code.decode(auth));
         }
 
         if(!(proxyUsername + ':' + proxyPassword).equals(auth)) {
@@ -294,7 +296,7 @@ public class HttpServer {
   protected Handler newSslRedirectHandler() {
     return new AbstractHandler() {
 
-      public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) {
+      public void handle(String target, Request unused, HttpServletRequest request, HttpServletResponse response) {
         int httpsPort = getHttpsPort();
         if(!((Request) request).isHandled() && request.getServerPort() != httpsPort) {
           String url = "https://" + request.getServerName() + ":" + httpsPort + request.getRequestURI();
@@ -354,21 +356,16 @@ public class HttpServer {
       mappings.add(constraintMapping);
     }
 
-    HashUserRealm userRealm = new HashUserRealm("TestRealm");
+    HashLoginService userRealm = new HashLoginService("TestRealm");
     for(String username : userPasswords.keySet()) {
       String password = userPasswords.get(username);
       String[] roles = userRoles.get(username);
 
-      userRealm.put(username, password);
-      if(roles != null) {
-        for(String role : roles) {
-          userRealm.addUserToRole(username, role);
-        }
-      }
+      userRealm.putUser(username, new Password(password), roles);
     }
 
-    SecurityHandler securityHandler = new SecurityHandler();
-    securityHandler.setUserRealm(userRealm);
+    ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+    securityHandler.setLoginService(userRealm);
     securityHandler.setConstraintMappings(mappings.toArray(new ConstraintMapping[mappings.size()]));
 
     return securityHandler;
@@ -471,7 +468,7 @@ public class HttpServer {
   protected Handler newSleepHandler(final long millis) {
     return new AbstractHandler() {
 
-      public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) {
+      public void handle(String target, Request unused, HttpServletRequest request, HttpServletResponse response) {
         if(millis >= 0) {
           try {
             Thread.sleep(millis);
@@ -621,7 +618,7 @@ public class HttpServer {
 
   class ResHandler extends AbstractHandler {
 
-    public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
+    public void handle(String target, Request unused, HttpServletRequest request, HttpServletResponse response)
         throws IOException {
       String uri = request.getRequestURI();
 
@@ -705,7 +702,7 @@ public class HttpServer {
 
   class RecordingHandler extends AbstractHandler {
 
-    public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) {
+    public void handle(String target, Request unused, HttpServletRequest request, HttpServletResponse response) {
       String uri = request.getRequestURI();
 
       for(String pattern : recordedPatterns) {