Merge branch 'master' into UTF-8-JENKINS-31096

Author: jglick

pom.xml

@@ -33,7 +33,7 @@
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-durable-task-step</artifactId>
-    <version>2.19-SNAPSHOT</version>
+    <version>2.20-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Pipeline: Nodes and Processes</name>
     <url>https://wiki.jenkins.io/display/JENKINS/Pipeline+Nodes+and+Processes+Plugin</url>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>durable-task</artifactId>
-            <version>1.18-20180212.221815-3</version> <!-- TODO https://github.com/jenkinsci/durable-task-plugin/pull/61 -->
+            <version>1.19-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/durable-task-plugin/pull/61 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>

src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/PowerShellStepTest.java

@@ -64,6 +64,13 @@ public class PowerShellStepTest {
         p.setDefinition(new CpsFlowDefinition("node {powershell 'throw \"bogus error\"'}"));
         j.assertLogContains("bogus error", j.assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0)));
     }
+    
+    @Test public void testUnicode() throws Exception {
+        WorkflowJob p = j.jenkins.createProject(WorkflowJob.class, "foobar");
+        p.setDefinition(new CpsFlowDefinition("node {def x = powershell(returnStdout: true, script: 'write-output \"Hëllö Wórld\"'); println x.replace(\"\ufeff\",\"\")}"));
+        String log = new String(j.getLog(j.assertBuildStatusSuccess(p.scheduleBuild2(0))).getBytes(), "UTF-8");
+        Assume.assumeTrue("Correct UTF-8 output should be produced",log.contains("Hëllö Wórld"));
+    }
 
 }