From 425692755c7e9689efb613a3e514127cf4780801 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 28 Mar 2019 14:13:43 -0400
Subject: [PATCH 1/2] Pick up
 https://github.com/jenkinsci/workflow-support-plugin/pull/94.

---
 pom.xml                                                       | 2 +-
 .../org/jenkinsci/plugins/workflow/cps/CpsStepContext.java    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2fd89657..8c1d1a444 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.1.0</git-plugin.version>
-        <workflow-support-plugin.version>3.2</workflow-support-plugin.version>
+        <workflow-support-plugin.version>3.3-rc722.bbeb9c8f3cf6</workflow-support-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-support-plugin/pull/94 -->
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <groovy-cps.version>1.26</groovy-cps.version>
         <structs-plugin.version>1.17</structs-plugin.version>
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java
index d2b1281c0..b9490eb70 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java
@@ -291,10 +291,6 @@ public CpsBodyInvoker newBodyInvoker() {
 
     @Override
     protected <T> T doGet(Class<T> key) throws IOException, InterruptedException {
-        if (FlowNode.class.isAssignableFrom(key)) {
-            return key.cast(getNode());
-        }
-
         CpsThread t = getThreadSynchronously();
         if (t == null) {
             throw new IOException("cannot find current thread");

From 838d6cfd592a04ecb6616c4a332b8c9b501c01ce Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 25 Apr 2019 22:06:55 -0400
Subject: [PATCH 2/2] workflow-support-plugin.version=3.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 645748f6c..194437d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <git-plugin.version>3.1.0</git-plugin.version>
-        <workflow-support-plugin.version>3.3-rc722.bbeb9c8f3cf6</workflow-support-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-support-plugin/pull/94 -->
+        <workflow-support-plugin.version>3.3</workflow-support-plugin.version>
         <scm-api-plugin.version>2.2.6</scm-api-plugin.version>
         <groovy-cps.version>1.27</groovy-cps.version>
         <structs-plugin.version>1.17</structs-plugin.version>