From d4fbda0c2dacb3e241496f9f772a8a8ed3219d16 Mon Sep 17 00:00:00 2001
From: arthurvanduynhoven <arthur.vanduynhoven@irdeto.com>
Date: Mon, 14 Oct 2019 14:13:48 +0200
Subject: [PATCH 1/2] Updated docker-commons to 1.15 and other dependencies

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b8076468..3170942be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,11 @@
     <properties>
         <revision>1.22</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.60.3</jenkins.version>
+        <jenkins.version>2.150.1</jenkins.version>
         <java.level>8</java.level>
-        <workflow-step-api-plugin.version>2.18</workflow-step-api-plugin.version>
-        <workflow-support-plugin.version>2.12</workflow-support-plugin.version>
-        <workflow-cps-plugin.version>2.25</workflow-cps-plugin.version>
+        <workflow-step-api-plugin.version>2.19</workflow-step-api-plugin.version>
+        <workflow-support-plugin.version>3.3</workflow-support-plugin.version>
+        <workflow-cps-plugin.version>2.67</workflow-cps-plugin.version>
     </properties>
     <repositories>
         <repository>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>docker-commons</artifactId>
-            <version>1.14</version>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-durable-task-step</artifactId>
-            <version>2.8</version>
+            <version>2.30</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -73,12 +73,12 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.8</version>
+            <version>2.33</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>script-security</artifactId>
-            <version>1.25</version>
+            <version>1.58</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials-binding</artifactId>
-            <version>1.12</version>
+            <version>1.18</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 095bfa7afede1f2209f74cfd44ab33d55e3b77ba Mon Sep 17 00:00:00 2001
From: Arthur Van Duynhoven <arthur.vanduynhoven@irdeto.com>
Date: Mon, 14 Oct 2019 15:57:59 +0200
Subject: [PATCH 2/2] remove check for null as it's being check in
 docker-commons library

---
 .../jenkinsci/plugins/docker/workflow/client/DockerClient.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
index 6562606fb..22e54d047 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
@@ -281,7 +281,7 @@ private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, @Nonnull
     private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull String... args) throws IOException, InterruptedException {
         return launch(launchEnv, quiet, pwd, new ArgumentListBuilder(args));
     }
-    private LaunchResult launch(@CheckForNull @Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {
+    private LaunchResult launch(@Nonnull EnvVars launchEnv, boolean quiet, FilePath pwd, @Nonnull ArgumentListBuilder args) throws IOException, InterruptedException {
         // Prepend the docker command
         args.prepend(DockerTool.getExecutable(toolName, node, launcher.getListener(), launchEnv));