From d59962b584ea4b652f9006fdc2b740005b1f3a64 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 11 May 2018 10:27:30 -0400
Subject: [PATCH 1/2] Test added in #63 was nondeterministic: the `latest` tag
 can float. Passes with 3.5.x, fails with 3.3.x.

---
 .../jenkinsci/plugins/docker/workflow/DockerDSLTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java b/src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java
index dc6edd59d..178061d67 100644
--- a/src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java
+++ b/src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java
@@ -153,9 +153,9 @@ private static void grep(File dir, String text, String prefix, Set<String> match
                 assumeDocker();
                 WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "p");
                 p.setDefinition(new CpsFlowDefinition(
-                        "docker.image('maven:latest').inside {\n" +
-                               "  sh 'mvn -version'\n" +
-                               "}", true));
+                        "docker.image('maven:3.5.3-jdk-8').inside {\n" +
+                        "  sh 'mvn -version'\n" +
+                        "}", true));
 
                 story.j.assertBuildStatusSuccess(p.scheduleBuild2(0));
             }

From 8c18a387f8536c948fa93edc54b465256d77817a Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 11 May 2018 10:28:07 -0400
Subject: [PATCH 2/2] Updates, incl. picking up release of
 https://github.com/jenkinsci/docker-commons-plugin/pull/67 (#133 was merged
 without this).

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 17035fc74..80eae5a3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.3</version>
+        <version>3.9</version>
         <relativePath />
     </parent>
     <artifactId>docker-workflow</artifactId>
@@ -33,7 +33,6 @@
         <java.level>8</java.level>
         <workflow-step-api-plugin.version>2.9</workflow-step-api-plugin.version>
         <workflow-support-plugin.version>2.12</workflow-support-plugin.version>
-        <hpi-plugin.version>2.2</hpi-plugin.version> <!-- TODO pending https://github.com/jenkinsci/plugin-pom/pull/94 -->
     </properties>
     <repositories>
         <repository>
@@ -51,7 +50,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>docker-commons</artifactId>
-            <version>1.12-20180131.190257-1</version> <!-- TODO https://github.com/jenkinsci/docker-commons-plugin/pull/67 -->
+            <version>1.12</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>