Merge pull request #191 from jglick/StepExecution.stop-JENKINS-26148

[JENKINS-26148] Using default implementation of StepExecution.stop
jenkinsci · Sep 28, 2017 · 5c2b7d1 · 5c2b7d1
2 parents 2a35f45 + b3c9d1b
commit 5c2b7d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...nition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/ScriptStep.java b/...nition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/ScriptStep.java
@@ -71,23 +71,15 @@ public DescriptorImpl() {
 
     public static final class ScriptStepExecution extends AbstractStepExecutionImpl {
 
-        private BodyExecution body;
-
         @Override
         public boolean start() throws Exception {
 
-            body = getContext().newBodyInvoker()
+            getContext().newBodyInvoker()
                     .withCallback(BodyExecutionCallback.wrap(getContext()))
                     .start();
             return false;
         }
 
-        @Override
-        public void stop(Throwable cause) throws Exception {
-            if (body != null)
-                body.cancel(cause);
-        }
-
         private static final long serialVersionUID = 1L;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -211,7 +211,7 @@
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-step-api</artifactId>
-        <version>2.11</version>
+        <version>2.13</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>