From f293f637c8d5dc9bcda3c7dea4f378919f2759bb Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Mar 2017 11:10:10 -0700
Subject: [PATCH] Issue #1394 - fix default character encoding for surefire
 testing

---
 .../test/java/org/eclipse/jetty/client/HttpClientURITest.java  | 3 ++-
 pom.xml                                                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
index 00d6feb8a85..c0a48532b12 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
+++ b/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.
diff --git a/pom.xml b/pom.xml
index 6b02d84909c..d6e1308db01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,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 -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
             <failIfNoTests>false</failIfNoTests>
             <forkCount>1</forkCount>
             <systemProperties>