Revert "[MRM-1828] upgrade to jetty 9.x"

This reverts commit a7a2c9130e30992d3d5dc4e6edac5d1d51034458.

3 files changed, 9 insertions, 16 deletions

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 9163042e1..b1bc6d99b 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -403,12 +403,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
index a9ac754d2..3192fce54 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
@@ -21,13 +21,11 @@ package org.apache.archiva.remotedownload;
 import org.apache.archiva.admin.model.beans.RemoteRepository;
 import org.apache.archiva.redback.rest.api.services.RoleManagementService;
 import org.apache.archiva.security.common.ArchivaRoleConstants;
-import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.apache.maven.wagon.repository.Repository;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
@@ -49,11 +47,12 @@ import java.io.IOException;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
 
 /**
  * @author Olivier Lamy
  */
-@RunWith(ArchivaBlockJUnit4ClassRunner.class)
+@RunWith( ArchivaBlockJUnit4ClassRunner.class )
 public class DownloadArtifactsTest
     extends AbstractDownloadTest
 {
@@ -86,9 +85,8 @@ public class DownloadArtifactsTest
     protected String getSpringConfigLocation()
     {
         return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml";
-    }
+    }    @Override
 
-    @Override
 
     @Before
     public void startServer()
@@ -108,7 +106,7 @@ public class DownloadArtifactsTest
 
         repoServer.setHandler( contextRepo );
         repoServer.start();
-        this.repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort();
+        this.repoServerPort = repoServer.getConnectors()[0].getLocalPort();
 
         //redirect handler
 
@@ -122,7 +120,7 @@ public class DownloadArtifactsTest
 
         redirectServer.setHandler( contextRedirect );
         redirectServer.start();
-        this.redirectPort = ServerConnector.class.cast( redirectServer.getConnectors()[0] ).getLocalPort();
+        this.redirectPort = redirectServer.getConnectors()[0].getLocalPort();
         log.info( "redirect server port {}", redirectPort );
 
     }
@@ -184,6 +182,8 @@ public class DownloadArtifactsTest
     }
 
 
+
+
     public static class RedirectServlet
         extends HttpServlet
     {
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
index 2734c0e90..1b15f06e0 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
@@ -81,7 +80,7 @@ public class RemoteRepositoryConnectivityCheckTest
         try
         {
 
-            int repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort();
+            int repoServerPort = repoServer.getConnectors()[0].getLocalPort();
 
             RemoteRepository repo = getRemoteRepository();
 
@@ -114,7 +113,7 @@ public class RemoteRepositoryConnectivityCheckTest
         try
         {
 
-            int repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort();
+            int repoServerPort = repoServer.getConnectors()[0].getLocalPort();
 
             RemoteRepository repo = getRemoteRepository();