Merge branch 'master' into sleep-longr

Author: MarkEWaite

Jenkinsfile

@@ -6,7 +6,6 @@ https://github.com/jenkins-infra/pipeline-library/
 */
 buildPlugin(
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
-  forkCount: '1C', 
   configurations: [
     [platform: 'linux', jdk: 21],
     [platform: 'windows', jdk: 17],

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.3</version>
+        <version>5.5</version>
         <relativePath/>
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -66,8 +66,6 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <!-- TODO Until in plugin-pom -->
-        <jenkins-test-harness.version>2357.vf2a_982b_b_910f</jenkins-test-harness.version>
         <jenkins.baseline>2.479</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <useBeta>true</useBeta>
@@ -79,7 +77,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>3482.vc10d4f6da_28a_</version>
+                <version>4023.va_eeb_b_4e45f07</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -170,7 +168,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>mock-slave</artifactId>
-            <version>153.v9768799a_2294</version>
+            <version>189.vca_72fb_1d2b_52</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java

@@ -526,6 +526,9 @@ private static final class NewlineSafeTaskListener extends OutputStreamTaskListe
         }
 
         @Override public String getStatus() {
+            if (controller == null) {
+                return "not yet started";
+            }
             StringBuilder b = new StringBuilder();
             try (Timeout timeout = Timeout.limit(2, TimeUnit.SECONDS)) { // CpsThreadDump applies a 3s timeout anyway
                 FilePath workspace = getWorkspace();
@@ -759,12 +762,11 @@ private static class HandlerImpl extends Handler {
 
         private void check(Computer c) {
             String name = c.getName();
-            StepExecution.applyAll(Execution.class, exec -> {
+            StepExecution.acceptAll(Execution.class, exec -> {
                 if (exec.watching && exec.node.equals(name)) {
                     LOGGER.fine(() -> "Online/offline event on " + name + ", checking current status of " + exec.remote + " soon");
                     threadPool().schedule(exec::check, 15, TimeUnit.SECONDS);
                 }
-                return null;
             });
         }
 

src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java

@@ -331,7 +331,7 @@ public void stop(@NonNull Throwable cause) throws Exception {
             }
             Set<StepContext> newAnomalous = new HashSet<>();
             Set<String> affectedNodes = new HashSet<>();
-            StepExecution.applyAll(ExecutorStepExecution.class, exec -> {
+            StepExecution.acceptAll(ExecutorStepExecution.class, exec -> {
                 StepContext ctx = exec.getContext();
                 if (!knownTasks.contains(ctx)) {
                     LOGGER.warning(() -> "do not know about " + ctx);
@@ -351,11 +351,10 @@ public void stop(@NonNull Throwable cause) throws Exception {
                 } else {
                     LOGGER.fine(() -> "know about " + ctx);
                 }
-                return null;
             }).get();
             // Also abort any shell steps running on the same node(s):
             if (!affectedNodes.isEmpty()) {
-                StepExecution.applyAll(DurableTaskStep.Execution.class, exec -> {
+                StepExecution.acceptAll(DurableTaskStep.Execution.class, exec -> {
                     if (affectedNodes.contains(exec.node)) {
                         StepContext ctx = exec.getContext();
                         try {
@@ -365,7 +364,6 @@ public void stop(@NonNull Throwable cause) throws Exception {
                         }
                         ctx.onFailure(new FlowInterruptedException(Result.ABORTED, false, new RemovedNodeCause()));
                     }
-                    return null;
                 });
             }
             for (StepContext ctx : newAnomalous) {