Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java

@@ -93,7 +93,8 @@ public class HttpClientURITest extends AbstractHttpClientServerTest
     public void testIDNRedirect() throws Exception
     {
         // Internationalized Domain Name.
-        String exampleHost = scheme + "://пример.рф";
+        // String exampleHost = scheme + "://пример.рф";
+        String exampleHost = scheme + "://\uD0BF\uD180\uD0B8\uD0BC\uD0B5\uD180.\uD180\uD184";
         String incorrectlyDecoded = new String(exampleHost.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
 
         // Simple server that only parses clear-text HTTP/1.1.

jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java

@@ -49,8 +49,8 @@ import org.junit.Test;
 public class SlowClientsTest
 {
     private Logger logger = Log.getLogger(getClass());
-
-    @Test
+    
+    @Test(timeout = 10000)
     public void testSlowClientsWithSmallThreadPool() throws Exception
     {
         File keystore = MavenTestingUtils.getTestResourceFile("keystore");

pom.xml

@@ -581,7 +581,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.19.1</version>
           <configuration>
-            <argLine>@{argLine} -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
+            <argLine>@{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
             <failIfNoTests>false</failIfNoTests>
             <forkCount>1</forkCount>
             <systemProperties>