From 1dc42a2cb16cf2530dafa3b0eaafe3dbcc07f90f Mon Sep 17 00:00:00 2001
From: Jeremy Ninnes <jeremy.ninnes@fivecast.com>
Date: Fri, 21 Jul 2023 15:24:24 +0930
Subject: [PATCH 1/2] Update to use Jenkins BOM for dependencies

---
 pom.xml | 69 ++++++++++++++++++++++-----------------------------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index d35773f..1225f7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
-    <version>1.609.1</version>
+    
+    <version>4.46</version>
     <relativePath />
   </parent>
 
@@ -15,11 +15,11 @@
   <packaging>hpi</packaging>
 
   <properties>
-    <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
-    <maven-hpi-plugin.version>1.112</maven-hpi-plugin.version>
-    <maven-deploy-plugin.version>2.6</maven-deploy-plugin.version>
     <wagon-http.version>2.10</wagon-http.version>
-    <workflow.version>1.11</workflow.version>
+    <workflow.version>2.80</workflow.version>
+    <!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
+    <jenkins.version>2.387.3</jenkins.version>
+    <java.version>8</java.version>
   </properties>
 
   <name>Bitbucket Build Status Notifier Plugin</name>
@@ -74,77 +74,63 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom-2.387.x</artifactId>
+        <version>2244.vd60654536b_96</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>git</artifactId>
-      <version>2.4.0</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>mercurial</artifactId>
-      <version>1.54</version>
+      <version>1260.vdfb_723cdcc81</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-step-api</artifactId>
-      <version>${workflow.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-cps</artifactId>
-      <version>${workflow.version}</version>
+
     </dependency>
+
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
-      <version>${workflow.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-aggregator</artifactId>
-      <version>${workflow.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-aggregator</artifactId>
-      <classifier>tests</classifier>
-      <version>${workflow.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-step-api</artifactId>
-      <classifier>tests</classifier>
-      <version>${workflow.version}</version>
-      <scope>test</scope>
+
     </dependency>
+
+
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>2.10.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.scribe</groupId>
       <artifactId>scribe</artifactId>
-      <version>1.3.3</version>
+      <version>1.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1.22</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>display-url-api</artifactId>
-      <version>0.4</version>
     </dependency>
   </dependencies>
 
@@ -153,7 +139,6 @@
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>
         <artifactId>maven-hpi-plugin</artifactId>
-        <version>${maven-hpi-plugin.version}</version>
         <extensions>true</extensions>
         <executions>
           <execution>
@@ -166,7 +151,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>${maven-release-plugin.version}</version>
         <configuration>
           <goals>deploy</goals>
         </configuration>
@@ -175,7 +159,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.wagon</groupId>

From 561e577a63f2f945109150440739ef755a63ba5f Mon Sep 17 00:00:00 2001
From: Jeremy Ninnes <jeremy.ninnes@fivecast.com>
Date: Fri, 21 Jul 2023 15:25:02 +0930
Subject: [PATCH 2/2] Fix JENKINS-40456 - use current build to find SCM values

---
 .../plugins/bitbucket/BitbucketBuildStatusHelper.java    | 9 ++++++++-
 1 file changed, 8 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 16c1d8b..b2d58cf 100644
--- a/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java
+++ b/src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java
@@ -58,6 +58,7 @@
 import org.jenkinsci.plugins.bitbucket.validator.BitbucketHostValidator;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.scribe.model.*;
 
 class BitbucketBuildStatusHelper {
@@ -134,7 +135,13 @@ public static List<BitbucketBuildStatusResource> createBuildStatusResources(fina
         Job<?, ?> project = build.getParent();
         List<BitbucketBuildStatusResource> buildStatusResources = new ArrayList<BitbucketBuildStatusResource>();
 
-        if (project instanceof WorkflowJob) {
+        if (build instanceof WorkflowRun) {
+            Collection<? extends SCM> scms = ((WorkflowRun)build).getSCMs();
+
+            for (SCM scm : scms) {
+                buildStatusResources.addAll(createBuildStatusResources(scm, build));
+            }
+        } else if (project instanceof WorkflowJob) {
             Collection<? extends SCM> scms = ((WorkflowJob)project).getSCMs();
 
             for (SCM scm : scms) {