From d9f52154becc387cae7774c84cd9c3bf54440e6d Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Sat, 15 Jun 2019 18:38:16 +0900
Subject: [PATCH 1/2] Update dependencies

* Declared directly required versions in the dependencies section.
    * Added script-security as groovy-script utilizes it.
    * Removed workflow-step-api as groovy-script itself doesn't use it even in tests.
* Reordered dependencies. Mandatory dependencies, optional dependencies and test dependencies.
* Use the least versions.
    * workflow-job-2.26 is required to test JENKINS-54128.
* Removed properties to specify dependency versions.
    * No longer necessary as they are used to synchronize versions for artifacts without classifier and with classifier=tests.
---
 pom.xml | 49 ++++++++++++-------------------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index de25c5c..fb4e640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,6 @@
   <properties>
     <jenkins.version>2.121.1</jenkins.version>
     <java.level>8</java.level>
-    <badge-plugin.version>1.5</badge-plugin.version>
-    <workflow-step-api-plugin.version>2.20</workflow-step-api-plugin.version>
-    <workflow-cps-plugin.version>2.69</workflow-cps-plugin.version>
   </properties>
 
   <scm>
@@ -65,7 +62,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>badge</artifactId>
-            <version>${badge-plugin.version}</version>
+            <version>1.5</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -73,69 +70,47 @@
             <version>1.12</version>
         </dependency>
         <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-cps</artifactId>
-            <version>${workflow-cps-plugin.version}</version>
-            <optional>true</optional>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>script-security</artifactId>
+            <version>1.42</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-step-api</artifactId>
-            <version>${workflow-step-api-plugin.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
+            <artifactId>workflow-cps</artifactId>
+            <version>2.54</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>2.32</version>
+            <version>2.26</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>2.15</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>junit</artifactId>
-            <version>1.20</version>
+            <version>2.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
     <dependencyManagement>
+        <!-- To resolve RequireUpperBoundDeps errors -->
         <dependencies>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-step-api</artifactId>
-                <version>${workflow-step-api-plugin.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-api</artifactId>
-                <version>2.33</version>
+                <version>2.30</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-support</artifactId>
-                <version>3.3</version>
+                <version>2.21</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>scm-api</artifactId>
                 <version>2.2.6</version>
             </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>structs</artifactId>
-                <version>1.19</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>script-security</artifactId>
-                <version>1.60</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>  

From 6db9feb79be28e23b4bd7e2d5b730c825ea661a7 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Sat, 15 Jun 2019 18:48:53 +0900
Subject: [PATCH 2/2] Use workflow-job-2.32 same as used in #40

* I fond that doesn't affect plugin dependencies.
---
 pom.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb4e640..7a3d66e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>2.26</version>
+            <version>2.32</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -96,21 +96,31 @@
     <dependencyManagement>
         <!-- To resolve RequireUpperBoundDeps errors -->
         <dependencies>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-step-api</artifactId>
+                <version>2.19</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-api</artifactId>
-                <version>2.30</version>
+                <version>2.32</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-support</artifactId>
-                <version>2.21</version>
+                <version>3.2</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>scm-api</artifactId>
                 <version>2.2.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>structs</artifactId>
+                <version>1.17</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>