Merge pull request #39 from dwnusbaum/JENKINS-60354

[JENKINS-60354] Mark that FlowInterruptedException is not used for actual interruption here
jenkinsci · Jan 3, 2020 · c3537e8 · c3537e8
2 parents 6799f70 + 8ac8621
commit c3537e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,10 +40,10 @@
     <properties>
         <revision>2.11</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.121.1</jenkins.version>
+        <jenkins.version>2.138.4</jenkins.version>
         <java.level>8</java.level>
         <scm-api.version>2.2.7</scm-api.version>
-        <workflow-step-api-plugin.version>2.18</workflow-step-api-plugin.version>
+        <workflow-step-api-plugin.version>2.22</workflow-step-api-plugin.version>
         <workflow-support-plugin.version>3.1</workflow-support-plugin.version>
         <workflow-cps-plugin.version>2.62</workflow-cps-plugin.version>
     </properties>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
-            <version>1.17</version>
+            <version>1.20</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerListener.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerListener.java
@@ -50,7 +50,7 @@ public void onCompleted(Run<?,?> run, @Nonnull TaskListener listener) {
                 }
             } else {
                 Result result = run.getResult();
-                trigger.context.onFailure(new FlowInterruptedException(result != null ? result : /* probably impossible */ Result.FAILURE, new DownstreamFailureCause(run)));
+                trigger.context.onFailure(new FlowInterruptedException(result != null ? result : /* probably impossible */ Result.FAILURE, false, new DownstreamFailureCause(run)));
             }
         }
         run.removeActions(BuildTriggerAction.class);