diff --git a/blueocean-pipeline-api-impl/pom.xml b/blueocean-pipeline-api-impl/pom.xml
index 850452959d..1241b0b0fb 100644
--- a/blueocean-pipeline-api-impl/pom.xml
+++ b/blueocean-pipeline-api-impl/pom.xml
@@ -74,6 +74,7 @@
org.jenkins-ci.plugins.workflow
workflow-durable-task-step
+ test
org.jenkins-ci.plugins
diff --git a/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeUtil.java b/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeUtil.java
index 3e5142465c..3b8e2ebae7 100644
--- a/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeUtil.java
+++ b/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeUtil.java
@@ -19,7 +19,6 @@
import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException;
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
import org.jenkinsci.plugins.workflow.support.actions.PauseAction;
-import org.jenkinsci.plugins.workflow.support.steps.ExecutorStep;
import org.jenkinsci.plugins.workflow.support.steps.input.InputAction;
import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -193,7 +192,7 @@ public static boolean isPausedForInputStep(@NonNull StepAtomNode step, @Nullable
}
/**
- * Determine if the given {@link FlowNode} is the initial {@link StepStartNode} for an {@link ExecutorStep}.
+ * Determine if the given {@link FlowNode} is the initial {@link StepStartNode} for an {@code ExecutorStep}.
*
* @param node a possibly null {@link FlowNode}
* @return true if {@code node} is the non-body start of the agent execution.
@@ -205,7 +204,7 @@ public static boolean isAgentStart(@Nullable FlowNode node) {
if (stepStartNode.getDescriptor() != null) {
StepDescriptor sd = stepStartNode.getDescriptor();
return sd != null &&
- ExecutorStep.DescriptorImpl.class.equals(sd.getClass()) &&
+ sd.getFunctionName().equals("node") &&
!stepStartNode.isBody();
}
}
diff --git a/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineRunImpl.java b/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineRunImpl.java
index 9a0bf2cd73..379c3bf390 100644
--- a/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineRunImpl.java
+++ b/blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineRunImpl.java
@@ -27,7 +27,6 @@
import jenkins.scm.api.SCMRevisionAction;
import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.jenkinsci.plugins.workflow.support.steps.ExecutorStepExecution;
import org.jenkinsci.plugins.workflow.support.steps.input.InputAction;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.export.Exported;
@@ -231,17 +230,13 @@ public String getCommitUrl() {
@Override
public String getCauseOfBlockage() {
for(Queue.Item i: Jenkins.get().getQueue().getItems()) {
- if (i.task instanceof ExecutorStepExecution.PlaceholderTask) {
- ExecutorStepExecution.PlaceholderTask task = (ExecutorStepExecution.PlaceholderTask) i.task;
- Run r = task.runForDisplay();
- if (r != null && r.equals(run)) {
- String cause = i.getCauseOfBlockage().getShortDescription();
- CauseOfBlockage causeOfBlockage = task.getCauseOfBlockage();
- if ( causeOfBlockage != null) {
- return causeOfBlockage.getShortDescription();
- }
- return cause;
+ if (run.equals(i.task.getOwnerExecutable())) {
+ String cause = i.getCauseOfBlockage().getShortDescription();
+ CauseOfBlockage causeOfBlockage = i.task.getCauseOfBlockage();
+ if (causeOfBlockage != null) {
+ return causeOfBlockage.getShortDescription();
}
+ return cause;
}
}
return null;
diff --git a/pom.xml b/pom.xml
index 1f7166d86c..b8f4ef896b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,12 +32,11 @@
when changing jenkins core version please remember to change it in Jenkinsfile as well jenkinsVersions
and acceptance-tests/runner/scripts/args.sh
-->
- 2.361.4
+ 2.401.3
javadoc-no-fork
1.12.0
10.13.0
6.14.4
- 2.2
4.7.0
0.8.6
false
@@ -190,7 +189,6 @@
commons-codec
commons-codec
- 1.15
provided
@@ -208,25 +206,6 @@
mockito-inline
test
-
- org.hamcrest
- hamcrest
- ${hamcrest.version}
- test
-
-
-
- org.hamcrest
- hamcrest
- ${hamcrest.version}
- test
-
-
- junit
- junit
- 4.13.2
- test
-
com.mashape.unirest
unirest-java
@@ -252,18 +231,12 @@
io.jenkins.tools.bom
- bom-2.361.x
+ bom-2.401.x
2102.v854b_fec19c92
import
pom
-
- org.jenkins-ci
- symbol-annotation
- 1.23
-
-
${project.groupId}
@@ -712,26 +685,7 @@
-
-
- org.codehaus.mojo
- animal-sniffer-maven-plugin
- 1.22
-
- true
-
-
-
-
- org.jenkins-ci.tools
- maven-hpi-plugin
-
- true
- ${hpi.dependencyResolution}
-
-
-
-
+
maven-surefire-plugin
true