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

[JENKINS-26148] Using default implementation of StepExecution.stop
jenkinsci · Nov 9, 2017 · addb287 · addb287
2 parents d19fefc + 199aca1
commit addb287
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.23</version>
+        <version>2.36</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins</groupId>
@@ -39,7 +39,7 @@
     </pluginRepositories>
     <properties>
         <jenkins.version>1.642.3</jenkins.version>
-        <workflow-step-api-plugin.version>2.11</workflow-step-api-plugin.version>
+        <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/StageStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/StageStepExecution.java
@@ -2,7 +2,6 @@
 
 import com.google.inject.Inject;
 import hudson.AbortException;
-import hudson.EnvVars;
 import hudson.Extension;
 import hudson.XmlFile;
 import hudson.model.InvisibleAction;
@@ -107,12 +106,6 @@ private static boolean isInsideParallel(FlowNode n) {
         }
     }
 
-    @Override
-    public void stop(Throwable cause) throws Exception {
-        // TODO
-        throw new UnsupportedOperationException();
-    }
-
     private static XmlFile getConfigFile() throws IOException {
         Jenkins j = Jenkins.getInstance();
         if (j == null) {