Merge pull request jenkinsci#95 from dwnusbaum/pct-cleanup

Update dependencies and remove test using LocalData to fix PCT failures

Author: dwnusbaum

pom.xml

@@ -66,8 +66,8 @@
         <changelist>-SNAPSHOT</changelist>
         <jenkins.version>2.150.1</jenkins.version>
         <java.level>8</java.level>
-        <workflow-step-api-plugin.version>2.16</workflow-step-api-plugin.version>
-        <workflow-support-plugin.version>2.21</workflow-support-plugin.version>
+        <workflow-step-api-plugin.version>2.18</workflow-step-api-plugin.version>
+        <workflow-support-plugin.version>3.1</workflow-support-plugin.version>
     </properties>
     <dependencies>
         <dependency>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.31</version>
+            <version>2.33</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -93,19 +93,19 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>2.61</version>
+            <version>2.62</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>2.26</version>
+            <version>2.31</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>2.2</version>
+            <version>2.14</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>script-security</artifactId>
-            <version>1.48</version>
+            <version>1.50</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java

@@ -28,8 +28,6 @@
 import com.google.common.base.Predicate;
 import hudson.FilePath;
 import hudson.Functions;
-import hudson.init.InitMilestone;
-import hudson.init.Initializer;
 import hudson.model.Computer;
 import hudson.model.Executor;
 import hudson.model.Item;
@@ -57,13 +55,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -86,11 +77,9 @@
 import net.sf.json.JSONObject;
 import net.sf.json.groovy.JsonSlurper;
 import org.acegisecurity.Authentication;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import static org.hamcrest.Matchers.*;
-import org.jboss.marshalling.ObjectResolver;
 import org.jenkinsci.plugins.durabletask.FileMonitoringTask;
 import org.jenkinsci.plugins.workflow.actions.LogAction;
 import org.jenkinsci.plugins.workflow.actions.QueueItemAction;
@@ -108,7 +97,6 @@
 import org.jenkinsci.plugins.workflow.steps.EchoStep;
 import org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep;
 import org.jenkinsci.plugins.workflow.steps.durable_task.Messages;
-import org.jenkinsci.plugins.workflow.support.pickles.serialization.RiverReader;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.AfterClass;
 import static org.junit.Assert.*;
@@ -126,7 +114,6 @@
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.RestartableJenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.jvnet.hudson.test.recipes.LocalData;
 
 /** Tests pertaining to {@code node} and {@code sh} steps. */
 public class ExecutorStepTest {
@@ -1121,105 +1108,6 @@ List<String> currentLabels() {
         });
     }
 
-    @Issue("JENKINS-39134")
-    @LocalData
-    @Test public void serialForm() {
-        story.addStep(new Statement() {
-            @Override public void evaluate() throws Throwable {
-                WorkflowJob p = story.j.jenkins.getItemByFullName("p", WorkflowJob.class);
-                WorkflowRun b = p.getBuildByNumber(1);
-                assertThat(patchedFiles, containsInAnyOrder(/* "program.dat", */"3.xml", "3.log", "log"));
-                /* TODO this seems to randomly not include the expected items:
-                assertThat(patchedFields, Matchers.containsInAnyOrder(
-                    // But not FileMonitoringController.controlDir, since this old version is still using location-independent .id.
-                    "private final java.lang.String org.jenkinsci.plugins.workflow.support.pickles.FilePathPickle.path",
-                    "private final java.lang.String org.jenkinsci.plugins.workflow.support.pickles.WorkspaceListLeasePickle.path",
-                    "private java.lang.String org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep$Execution.remote"));
-                */
-                story.j.assertLogContains("simulated later output", story.j.assertBuildStatusSuccess(story.j.waitForCompletion(b)));
-            }
-        });
-    }
-    private static final List<String> patchedFiles = new ArrayList<>();
-    private static final List<String> patchedFields = new ArrayList<>();
-    // TODO @TestExtension("serialForm") ItemListener does not work since we need to run before FlowExecutionList.ItemListenerImpl yet TestExtension does not support ordinal
-    @Initializer(before = InitMilestone.JOB_LOADED) public static void replaceWorkspacePath() throws Exception {
-        final File prj = new File(Jenkins.getInstance().getRootDir(), "jobs/p");
-        final File workspace = new File(prj, "workspace");
-        final String ORIG_WS = "/space/tmp/AbstractStepExecutionImpl-upgrade/jobs/p/workspace";
-        final String newWs = workspace.getAbsolutePath();
-        File controlDir = new File(workspace, ".eb6272d3");
-        if (!controlDir.isDirectory()) {
-            return;
-        }
-        System.err.println("Patching " + controlDir);
-        RiverReader.customResolver = new ObjectResolver() {
-            @Override public Object readResolve(Object replacement) {
-                Class<?> c = replacement.getClass();
-                //System.err.println("replacing " + c.getName());
-                while (c != Object.class) {
-                    for (Field f : c.getDeclaredFields()) {
-                        if (f.getType() == String.class) {
-                            try {
-                                f.setAccessible(true);
-                                Object v = f.get(replacement);
-                                if (ORIG_WS.equals(v)) {
-                                    //System.err.println("patching " + f);
-                                    f.set(replacement, newWs);
-                                    patchedFields.add(f.toString());
-                                } else if (newWs.equals(v)) {
-                                    //System.err.println(f + " was already patched, somehow?");
-                                } else {
-                                    //System.err.println("some other value " + v + " for " + f);
-                                }
-                            } catch (Exception x) {
-                                x.printStackTrace();
-                            }
-                        }
-                    }
-                    c = c.getSuperclass();
-                }
-                return replacement;
-            }
-            @Override public Object writeReplace(Object original) {
-                throw new IllegalStateException();
-            }
-        };
-        Files.walkFileTree(prj.toPath(), new SimpleFileVisitor<Path>() {
-            @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                File f = file.toFile();
-                String name = f.getName();
-                if (name.equals("program.dat")) {
-                    /* TODO could not get this to work; stream appeared corrupted:
-                    patchedFiles.add(name);
-                    String origContent = FileUtils.readFileToString(f, StandardCharsets.ISO_8859_1);
-                    String toReplace = String.valueOf((char) Protocol.ID_STRING_SMALL) + String.valueOf((char) ORIG_WS.length()) + ORIG_WS;
-                    int newLen = newWs.length();
-                    String replacement = String.valueOf((char) Protocol.ID_STRING_MEDIUM) +
-                                         String.valueOf((char) (newLen & 0xff00) >> 8) +
-                                         String.valueOf((char) newLen & 0xff) +
-                                         newWs; // TODO breaks if not ASCII
-                    String replacedContent = origContent.replace(toReplace, replacement);
-                    assertNotEquals("failed to replace ‘" + toReplace + "’", replacedContent, origContent);
-                    FileUtils.writeStringToFile(f, replacedContent, StandardCharsets.ISO_8859_1);
-                    */
-                } else {
-                    String origContent = FileUtils.readFileToString(f, StandardCharsets.ISO_8859_1);
-                    String replacedContent = origContent.replace(ORIG_WS, newWs);
-                    if (!replacedContent.equals(origContent)) {
-                        patchedFiles.add(name);
-                        FileUtils.writeStringToFile(f, replacedContent, StandardCharsets.ISO_8859_1);
-                    }
-                }
-                return super.visitFile(file, attrs);
-            }
-        });
-        FilePath controlDirFP = new FilePath(controlDir);
-        controlDirFP.child("jenkins-result.txt").write("0", null);
-        FilePath log = controlDirFP.child("jenkins-log.txt");
-        log.write(log.readToString() + "simulated later output\n", null);
-    }
-
     @Issue("SECURITY-675")
     @Test public void authentication() {
         story.then(r -> {