From d4207668bc46e058d6379430ee23ac0e3db14afb Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Jul 2019 21:11:04 -0400 Subject: [PATCH 1/5] Using a BOM. --- pom.xml | 55 ++++++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index 56747291..98940ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 3.43 + 3.47 org.jenkins-ci.plugins.workflow @@ -36,7 +36,7 @@ ${revision}${changelist} hpi Pipeline: Basic Steps - https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Basic+Steps+Plugin + https://wiki.jenkins.io/display/JENKINS/Pipeline+Basic+Steps+Plugin MIT License @@ -64,83 +64,77 @@ 2.19 -SNAPSHOT - 2.150.1 + 2.150.3 8 - 2.20 - 2.70 - 3.3 - 2.34 true 4.0.0-beta3 - 2.2.6 + + + + io.jenkins.tools.bom + bom + 2.150.1-rc82.bd101ca058b9 + import + pom + + + org.jenkins-ci.plugins.workflow workflow-step-api - ${workflow-step-api-plugin.version} org.jenkins-ci.plugins mailer - 1.18 org.jenkins-ci.plugins.workflow workflow-step-api - ${workflow-step-api-plugin.version} tests test org.jenkins-ci.plugins.workflow workflow-api - ${workflow-api-plugin.version} org.jenkins-ci.plugins structs - 1.18 org.jenkins-ci.plugins apache-httpcomponents-client-4-api - 4.5.5-3.0 org.jenkins-ci.plugins.workflow workflow-cps - ${workflow-cps-plugin.version} test org.jenkins-ci.plugins.workflow workflow-cps - ${workflow-cps-plugin.version} tests test org.jenkins-ci.plugins.workflow workflow-job - 2.31 test org.jenkins-ci.plugins.workflow workflow-durable-task-step - 2.31 org.jenkins-ci.plugins.workflow workflow-support - ${workflow-support-plugin.version} test org.jenkins-ci.plugins.workflow workflow-support - ${workflow-support-plugin.version} tests test @@ -153,7 +147,6 @@ org.jenkins-ci.plugins junit - 1.15 test @@ -174,16 +167,9 @@ 2.2 test - - org.jenkins-ci.plugins.workflow - workflow-scm-step - 2.7 - test - org.jenkins-ci.plugins script-security - 1.58 test @@ -201,7 +187,7 @@ org.jenkins-ci.plugins.workflow workflow-api - ${workflow-api-plugin.version} + 2.35 tests test @@ -214,7 +200,7 @@ org.jenkins-ci.plugins scm-api - ${scm-api-plugin.version} + 2.6.3 tests test @@ -226,13 +212,4 @@ test - - - - org.jenkins-ci.plugins - scm-api - ${scm-api-plugin.version} - - - From 21a08cec741bfa6f6aec8af8bbcb329870640d90 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Jul 2019 06:21:15 -0400 Subject: [PATCH 2/5] The BOM now covers the test JARs used in this plugin. --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 98940ed2..044d55e3 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ io.jenkins.tools.bom bom - 2.150.1-rc82.bd101ca058b9 + 2.150.1-rc89.946de4daedb3 import pom @@ -187,7 +187,6 @@ org.jenkins-ci.plugins.workflow workflow-api - 2.35 tests test @@ -200,7 +199,6 @@ org.jenkins-ci.plugins scm-api - 2.6.3 tests test From c53b6c8b59b7beb654b53abf2820e97433f8c73f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 24 Jul 2019 10:37:37 -0400 Subject: [PATCH 3/5] bom-2.150.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 044d55e3..71426147 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ io.jenkins.tools.bom bom - 2.150.1-rc89.946de4daedb3 + 2.150.1 import pom From a228c2e10cdbb93b292f74d44666f9b2cb1d5a75 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 26 Sep 2019 20:14:16 -0400 Subject: [PATCH 4/5] Updated to new BOM. --- pom.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 71426147..3c4c914d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 3.47 + 3.50 org.jenkins-ci.plugins.workflow @@ -67,14 +67,13 @@ 2.150.3 8 true - 4.0.0-beta3 io.jenkins.tools.bom - bom - 2.150.1 + bom-2.150.x + 3 import pom @@ -175,13 +174,11 @@ org.jenkins-ci.plugins ansicolor - 0.5.0 test org.jenkins-ci.plugins pipeline-input-step - 2.8 test @@ -193,7 +190,6 @@ org.jenkins-ci.plugins git - ${git-plugin.version} test @@ -205,7 +201,6 @@ org.jenkins-ci.plugins git - ${git-plugin.version} tests test From aabb0413179ff6e014bb5fbb175fda573ae8176c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 23 Jan 2020 14:48:10 -0500 Subject: [PATCH 5/5] Go up to 3.56 parent Co-Authored-By: Liam Newman --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c4c914d..20e92463 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 3.50 + 3.56 org.jenkins-ci.plugins.workflow