Update Jetty version in uitest

Change-Id: I74300ea0724be1e56ea94d3f1327f49b05a09a87

3 files changed, 24 insertions, 56 deletions

diff --git a/uitest/pom.xml b/uitest/pom.xml
index 8b87953f7d..c08cee171f 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -11,7 +11,7 @@
 	<name>vaadin-uitest</name>
 	<packaging>war</packaging>
 	<properties>
-		<jetty.version>8.1.12.v20130726</jetty.version>
+		<jetty.version>9.3.9.v20160517</jetty.version>
 		<skip.uitest.deployment>true</skip.uitest.deployment>
 	</properties>
 
@@ -119,12 +119,6 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
 			<version>${jetty.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
 		<!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
@@ -132,64 +126,32 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlets</artifactId>
 			<version>${jetty.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-websocket</artifactId>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-server</artifactId>
 			<version>${jetty.version}</version>
-
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
 			<version>${jetty.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
 			<version>${jetty.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-runner</artifactId>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-proxy</artifactId>
 			<version>${jetty.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.eclipse.jetty</groupId>
-					<artifactId>orbit</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -227,7 +189,7 @@
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-testbench</artifactId>
 			<version>4.0.3</version>
-            <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 		<!-- This should be removed once tests have been updated to use lang3 -->
 		<dependency>
@@ -276,9 +238,14 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 				<version>${jetty.version}</version>
+				<configuration>
+					<httpConnector>
+						<port>8888</port>
+					</httpConnector>
+				</configuration>
 			</plugin>
 
 			<plugin>
diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
index 8f86c2d288..5861ede412 100644
--- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -46,8 +46,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.Scanner;
 import org.eclipse.jetty.util.log.JavaUtilLog;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -166,18 +165,20 @@ public class DevelopmentServerLauncher {
 
         final Server server = new Server();
 
-        final Connector connector = new SelectChannelConnector();
+        final ServerConnector connector = new ServerConnector(server);
 
         connector.setPort(port);
         if (serverArgs.containsKey("withssl")) {
-            final SslSocketConnector sslConnector = new SslSocketConnector();
-            sslConnector.setPort(8444);
-            SslContextFactory sslFact = sslConnector.getSslContextFactory();
-            sslFact.setTrustStore(KEYSTORE);
+            SslContextFactory sslFact = new SslContextFactory();
+            sslFact.setTrustStorePath(KEYSTORE);
             sslFact.setTrustStorePassword("password");
             sslFact.setKeyStorePath(KEYSTORE);
             sslFact.setKeyManagerPassword("password");
             sslFact.setKeyStorePassword("password");
+
+            ServerConnector sslConnector = new ServerConnector(server, sslFact);
+            sslConnector.setPort(8444);
+
             server.setConnectors(new Connector[] { connector, sslConnector });
         } else {
             server.setConnectors(new Connector[] { connector });
@@ -272,7 +273,7 @@ public class DevelopmentServerLauncher {
 
                 scanner.setScanDirs(classFolders);
                 scanner.start();
-                server.getContainer().addBean(scanner);
+                server.addBean(scanner);
             }
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
index 887eae315d..04d493eef5 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
@@ -20,10 +20,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlets.ProxyServlet;
+import org.eclipse.jetty.proxy.ProxyServlet;
 
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.server.ExternalResource;
@@ -88,7 +88,7 @@ public class ProxyTest extends AbstractTestUI {
 
         // Set up a server
         server = new Server();
-        SelectChannelConnector connector = new SelectChannelConnector();
+        ServerConnector connector = new ServerConnector(server);
         // Uses random available port by default, uncomment this to make local
         // testing easier (you can just reload old tab after restarting proxy)
         // connector.setPort(8889);