From 4bfb312a8c976ab52a61578e5d59985f81259a0c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 20 Dec 2016 12:28:48 -0700
Subject: [PATCH 1/2] Updating jetty-version-maven-plugin

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c93ae41b5ba..4844b82aef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -823,6 +823,7 @@
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>update-version-text</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <refreshTags>true</refreshTags>

From b9fd70f5ad3c6786ac48afa04345089b358fa3a4 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 20 Dec 2016 14:31:56 -0700
Subject: [PATCH 2/2] Bumping up test timeouts

---
 .../server/PerMessageDeflateExtensionTest.java       | 10 +++++-----
 .../jetty/websocket/server/WebSocketOverSSLTest.java | 12 +++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
index 6eb97ff7b60..282617e4e45 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
@@ -18,6 +18,10 @@
 
 package org.eclipse.jetty.websocket.server;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,10 +47,6 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
 @RunWith(Parameterized.class)
 public class PerMessageDeflateExtensionTest
 {
@@ -155,7 +155,7 @@ public class PerMessageDeflateExtensionTest
             Future<Session> fut = client.connect(clientSocket,server.getServerUri(),request);
 
             // Wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(30,TimeUnit.SECONDS);
 
             assertThat("Response.extensions",getNegotiatedExtensionList(session),containsString("permessage-deflate"));
 
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
index 34a9793a0b2..796b664fd1f 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
@@ -41,6 +41,8 @@ import org.junit.Test;
 
 public class WebSocketOverSSLTest
 {
+    public static final int CONNECT_TIMEOUT = 15000;
+    public static final int FUTURE_TIMEOUT_SEC = 30;
     @Rule
     public TestTracker tracker = new TestTracker();
     
@@ -82,7 +84,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(3,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             String msg = "this is an echo ... cho ... ho ... o";
@@ -116,7 +118,7 @@ public class WebSocketOverSSLTest
         WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
         try
         {
-            client.setConnectTimeout(3000);
+            client.setConnectTimeout(CONNECT_TIMEOUT);
             client.start();
 
             CaptureSocket clientSocket = new CaptureSocket();
@@ -125,7 +127,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             RemoteEndpoint remote = session.getRemote();
@@ -158,7 +160,7 @@ public class WebSocketOverSSLTest
         WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
         try
         {
-            client.setConnectTimeout(3000);
+            client.setConnectTimeout(CONNECT_TIMEOUT);
             client.start();
 
             CaptureSocket clientSocket = new CaptureSocket();
@@ -167,7 +169,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             RemoteEndpoint remote = session.getRemote();