From 55405679b443ddc64ce8fe8ffc492d4c6008eb38 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:20:22 -0400 Subject: [PATCH 01/18] Use current build to find SCM values fixes https://issues.jenkins-ci.org/browse/JENKINS-40456 --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index 5c03689..6c8c9f6 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -139,7 +139,11 @@ public static List createBuildStatusResources(fina List buildStatusResources = new ArrayList(); if (project instanceof WorkflowJob) { - Collection scms = ((WorkflowJob)project).getSCMs(); + Map scm_map = new LinkedHashMap<>(); + for (WorkflowRun.SCMCheckout co : build.checkouts(null)) { + scm_map.put(co.scm.getKey(), co.scm); + } + Collection scms = scm_map.values(); for (SCM scm : scms) { buildStatusResources.addAll(createBuildStatusResources(scm, build)); From af495c6136d90834c390aec1a0a1b257163a049c Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:29:21 -0400 Subject: [PATCH 02/18] use valid java 1.6 --- .../jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index 6c8c9f6..540b875 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -139,7 +139,7 @@ public static List createBuildStatusResources(fina List buildStatusResources = new ArrayList(); if (project instanceof WorkflowJob) { - Map scm_map = new LinkedHashMap<>(); + Map scm_map = new LinkedHashMap(); for (WorkflowRun.SCMCheckout co : build.checkouts(null)) { scm_map.put(co.scm.getKey(), co.scm); } From 15186172ae620199d7ea4bf9eb1e7adcea53534f Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:33:52 -0400 Subject: [PATCH 03/18] import the classes needed --- .../jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index 540b875..aee5c6b 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -60,6 +60,7 @@ import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider; import org.jenkinsci.plugins.multiplescms.MultiSCM; import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.scribe.model.*; class BitbucketBuildStatusHelper { From af03dd61ba83b55c85922735286097c800d1e06b Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:43:35 -0400 Subject: [PATCH 04/18] more type fixes --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index aee5c6b..cb7a489 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -59,7 +60,6 @@ import org.jenkinsci.plugins.bitbucket.validator.BitbucketHostValidator; import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider; import org.jenkinsci.plugins.multiplescms.MultiSCM; -import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.scribe.model.*; @@ -139,9 +139,9 @@ public static List createBuildStatusResources(fina Job project = build.getParent(); List buildStatusResources = new ArrayList(); - if (project instanceof WorkflowJob) { + if (build instanceof WorkflowRun) { Map scm_map = new LinkedHashMap(); - for (WorkflowRun.SCMCheckout co : build.checkouts(null)) { + for (WorkflowRun.SCMCheckout co : (WorkflowRun)build.checkouts(null)) { scm_map.put(co.scm.getKey(), co.scm); } Collection scms = scm_map.values(); From 71bf39f51900ddac4fe57498cf4d353aad3d8c56 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:46:49 -0400 Subject: [PATCH 05/18] try simpler code --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index cb7a489..84c1a50 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -39,7 +39,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -140,13 +139,7 @@ public static List createBuildStatusResources(fina List buildStatusResources = new ArrayList(); if (build instanceof WorkflowRun) { - Map scm_map = new LinkedHashMap(); - for (WorkflowRun.SCMCheckout co : (WorkflowRun)build.checkouts(null)) { - scm_map.put(co.scm.getKey(), co.scm); - } - Collection scms = scm_map.values(); - - for (SCM scm : scms) { + for (SCM scm : ((WorkflowRun)build).getSCMs()) { buildStatusResources.addAll(createBuildStatusResources(scm, build)); } } else if (project instanceof AbstractProject) { From a5180533c1f34ed1cca63c7de4cb555533c0ae70 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:50:03 -0400 Subject: [PATCH 06/18] i haven't done java in a long time... --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index 84c1a50..339a2b4 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -139,7 +139,8 @@ public static List createBuildStatusResources(fina List buildStatusResources = new ArrayList(); if (build instanceof WorkflowRun) { - for (SCM scm : ((WorkflowRun)build).getSCMs()) { + WorkflowRun workflowRun = (WorkflowRun)build; + for (SCM scm : workflowRun.getSCMs()) { buildStatusResources.addAll(createBuildStatusResources(scm, build)); } } else if (project instanceof AbstractProject) { From 78b36226914a7cad493ba6c7e0bfef01e9df94a6 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:55:15 -0400 Subject: [PATCH 07/18] try a different method --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index 339a2b4..c50ecd1 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -140,7 +140,12 @@ public static List createBuildStatusResources(fina if (build instanceof WorkflowRun) { WorkflowRun workflowRun = (WorkflowRun)build; - for (SCM scm : workflowRun.getSCMs()) { + List scmCheckouts = workflowRun.checkouts(null); + List scmList = new ArrayList<>(); + for (SCMCheckout checkout : scmCheckouts) { + scmList.add(checkout.getScm()); + } + for (SCM scm : scmList) { buildStatusResources.addAll(createBuildStatusResources(scm, build)); } } else if (project instanceof AbstractProject) { From f33af6c27ee8982dc5ffe7b7de831aa5ea71d5fa Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 15:56:18 -0400 Subject: [PATCH 08/18] JAVA 1.6!!! --- .../jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index c50ecd1..e77a6c0 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -141,7 +141,7 @@ public static List createBuildStatusResources(fina if (build instanceof WorkflowRun) { WorkflowRun workflowRun = (WorkflowRun)build; List scmCheckouts = workflowRun.checkouts(null); - List scmList = new ArrayList<>(); + List scmList = new ArrayList(); for (SCMCheckout checkout : scmCheckouts) { scmList.add(checkout.getScm()); } From d6d7288ed0fadeac9dc644b0e2ad453442e8b7f3 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:00:53 -0400 Subject: [PATCH 09/18] uprev workflow job plugins --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc69bca..047952b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.112 2.6 2.10 - 1.11 + 2.38 Bitbucket Build Status Notifier Plugin From 8c464cf6b1e7afbd3470d5e321de1bb35fefb97d Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:01:32 -0400 Subject: [PATCH 10/18] back to getSCMs --- .../plugins/bitbucket/BitbucketBuildStatusHelper.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java index e77a6c0..339a2b4 100644 --- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java +++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java @@ -140,12 +140,7 @@ public static List createBuildStatusResources(fina if (build instanceof WorkflowRun) { WorkflowRun workflowRun = (WorkflowRun)build; - List scmCheckouts = workflowRun.checkouts(null); - List scmList = new ArrayList(); - for (SCMCheckout checkout : scmCheckouts) { - scmList.add(checkout.getScm()); - } - for (SCM scm : scmList) { + for (SCM scm : workflowRun.getSCMs()) { buildStatusResources.addAll(createBuildStatusResources(scm, build)); } } else if (project instanceof AbstractProject) { From 6b513e0f46ddf2fd470492c7e2b9c07a1f6c3c7f Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:06:34 -0400 Subject: [PATCH 11/18] go as low as we can --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 047952b..f5f0681 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.112 2.6 2.10 - 2.38 + 2.36 Bitbucket Build Status Notifier Plugin From fbe1eff814554edd5426fead691d30bf5b9d4001 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:14:38 -0400 Subject: [PATCH 12/18] better versioning --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f5f0681..5dc33f9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.112 2.6 2.10 - 2.36 + 1.11 Bitbucket Build Status Notifier Plugin @@ -88,17 +88,17 @@ org.jenkins-ci.plugins.workflow workflow-step-api - ${workflow.version} + 2.22 org.jenkins-ci.plugins.workflow workflow-cps - ${workflow.version} + 2.80 org.jenkins-ci.plugins.workflow workflow-job - ${workflow.version} + 2.36 org.jenkins-ci.plugins.workflow From 16dbde6974e9c393c16f5879884220e89b554d63 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:18:40 -0400 Subject: [PATCH 13/18] more dependencies --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 5dc33f9..2d43088 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,11 @@ mercurial 1.54 + + org.jenkins-ci.plugins.workflow + workflow-scm-step + 2.10 + org.jenkins-ci.plugins.workflow workflow-step-api From d0e1581c6456a09351934ef526e81064e5dc8342 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:22:26 -0400 Subject: [PATCH 14/18] uprev min jenkins version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d43088..3e31b74 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jenkins-ci.plugins plugin - 1.609.1 + 2.60 From b814d416e81bd3cdcddd1e7cf8eb3c0eea08cd84 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:30:24 -0400 Subject: [PATCH 15/18] big uprev --- pom.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3e31b74..271e56c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,21 @@ org.jenkins-ci.plugins plugin - 2.60 + 3.5 - + bitbucket-build-status-notifier 1.4.3-SNAPSHOT hpi + + + 2.176 + + 8 + + 2.5.1 1.112 From 49a2f73a452200d3f15764a3a28169d50ecfd36f Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:31:48 -0400 Subject: [PATCH 16/18] fix formatting --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 271e56c..afaefc6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,6 @@ 2.176 8 - - - 2.5.1 1.112 2.6 @@ -92,11 +89,6 @@ mercurial 1.54 - - org.jenkins-ci.plugins.workflow - workflow-scm-step - 2.10 - org.jenkins-ci.plugins.workflow workflow-step-api From b5ba48fe5ee3a7e5a7b9b19295570a4190d72a2d Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:40:17 -0400 Subject: [PATCH 17/18] use micro releases --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afaefc6..8152047 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jenkins-ci.plugins plugin - 3.5 + 3.54 @@ -16,7 +16,7 @@ - 2.176 + 2.176.2 8 2.5.1 From 649a4589304150a6f59d6b5a93f6c0d008a6c207 Mon Sep 17 00:00:00 2001 From: Joseph Solomon Date: Fri, 10 Apr 2020 16:44:10 -0400 Subject: [PATCH 18/18] use builtin jenkins plugin build instead of custom maven --- pom.xml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/pom.xml b/pom.xml index 8152047..a6fe044 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,6 @@ 2.176.2 8 - 2.5.1 - 1.112 - 2.6 2.10 1.11 @@ -157,46 +154,6 @@ - - - - org.jenkins-ci.tools - maven-hpi-plugin - ${maven-hpi-plugin.version} - true - - - - generate-taglib-interface - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - deploy - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - org.apache.maven.wagon - wagon-http - ${wagon-http.version} - jar - - - - - - repo.jenkins-ci.org