Fix JENKINS-54249

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.coravy.hudson.plugins.github</groupId>
     <artifactId>github</artifactId>
-    <version>1.29.5-SNAPSHOT</version>
+    <version>1.30.0-SNAPSHOT</version>
     <packaging>hpi</packaging>
 
     <name>GitHub plugin</name>
@@ -47,10 +47,10 @@
     </issueManagement>
 
     <properties>
-        <jenkins.version>2.60.3</jenkins.version>
+        <jenkins.version>2.107.3</jenkins.version>
         <release.skipTests>false</release.skipTests>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
+        <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
         <concurrency>1</concurrency>
         <java.level>8</java.level>
         <workflow.version>1.14.2</workflow.version>
@@ -62,7 +62,7 @@
             <url>https://repo.jenkins-ci.org/public/</url>
         </repository>
     </repositories>
-    
+
     <pluginRepositories>
         <pluginRepository>
             <id>repo.jenkins-ci.org</id>
@@ -99,13 +99,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>git</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>scm-api</artifactId>
-            <version>2.2.0</version>
+            <version>4.0.0-rc</version>
         </dependency>
 
         <dependency>
@@ -129,7 +123,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>token-macro</artifactId>
-            <version>1.12.1</version>
+            <version>2.1</version>
         </dependency>
 
         <dependency>
@@ -157,7 +151,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>apache-httpcomponents-client-4-api</artifactId>
-            <version>4.5.3-2.1</version>
+            <version>4.5.5-3.0</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/org/jenkinsci/plugins/github/status/sources/BuildDataRevisionShaSource.java

@@ -6,7 +6,7 @@
 import hudson.model.TaskListener;
 import org.eclipse.jgit.lib.ObjectId;
 import org.jenkinsci.plugins.github.extension.status.GitHubCommitShaSource;
-import org.jenkinsci.plugins.github.util.BuildDataHelper;
+import org.jenkinsci.plugins.github.util.BuildDetailsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import javax.annotation.Nonnull;
@@ -29,7 +29,7 @@ public BuildDataRevisionShaSource() {
      */
     @Override
     public String get(@Nonnull Run<?, ?> run, @Nonnull TaskListener listener) throws IOException {
-        return ObjectId.toString(BuildDataHelper.getCommitSHA1(run));
+        return ObjectId.toString(BuildDetailsHelper.getCommitSHA1(run));
     }
 
     @Extension

src/main/java/org/jenkinsci/plugins/github/util/BuildDetailsHelper.java

@@ -0,0 +1,126 @@
+package org.jenkinsci.plugins.github.util;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+import org.eclipse.jgit.lib.ObjectId;
+
+import hudson.model.Job;
+import hudson.model.Run;
+import hudson.plugins.git.Revision;
+import hudson.plugins.git.UserRemoteConfig;
+import hudson.plugins.git.util.Build;
+import hudson.plugins.git.util.BuildData;
+import hudson.plugins.git.util.BuildDetails;
+
+/**
+ * Stores common methods for {@link BuildDetails} handling.
+ *
+ * @author Baptiste Gaillard <baptiste.gaillard@gmail.com>
+ * @since 1.30.0
+ */
+public final class BuildDetailsHelper {
+
+    private BuildDetailsHelper() {
+    }
+
+    /**
+     * Calculate build data from downstream builds, that could be a shared library which is loaded first in a pipeline.
+     * For that reason, this method compares all remote URLs for each build data, with the real project name, to
+     * determine the proper build data. This way, the SHA returned in the build data will relate to the project.
+     *
+     * @param parentName name of the parent build.
+     * @param parentFullName full name of the parent build.
+     * @param buildDetailsList the list of build details from a build run.
+     *
+     * @return the build data related to the project, null if not found.
+     */
+    public static BuildDetails calculateBuildDetails(
+        String parentName, String parentFullName, List<BuildDetails> buildDetailsList
+    ) {
+        if (buildDetailsList == null) {
+            return null;
+        }
+
+        if (buildDetailsList.size() == 1) {
+            return buildDetailsList.get(0);
+        }
+
+        String projectName = parentFullName.replace(parentName, "");
+
+        if (projectName.endsWith("/")) {
+            projectName = projectName.substring(0, projectName.lastIndexOf('/'));
+        }
+
+        for (BuildDetails buildDetails : buildDetailsList) {
+            Set<String> remoteUrls = buildDetails.getRemoteUrls();
+
+            for (String remoteUrl : remoteUrls) {
+                if (remoteUrl.contains(projectName)) {
+                    return buildDetails;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets SHA1 from the build.
+     *
+     * @param build
+     *
+     * @return SHA1 of the last build.
+     *
+     * @throws IOException Cannot get the info about commit ID.
+     */
+    @Nonnull
+    public static ObjectId getCommitSHA1(@Nonnull Run<?, ?> build) throws IOException {
+
+        Job<?, ?> parent = build.getParent();
+
+        List<BuildDetails> buildDetailsList = build.getActions(BuildDetails.class);
+
+        // If we cannot get build data from a 'BuildDetails' action then we try to get it from a 'BuildData' action.
+        // This should not be possible in the future as the 'BuildData' class will be deprecated.
+        if (buildDetailsList.isEmpty()) {
+            buildDetailsList = new ArrayList<>();
+
+            for (BuildData buildData : build.getActions(BuildData.class)) {
+                Collection<UserRemoteConfig> remoteConfigs = new ArrayList<>();
+
+                for (String url : buildData.getRemoteUrls()) {
+                    remoteConfigs.add(new UserRemoteConfig(url, null, null, null));
+                }
+
+                buildDetailsList.add(new BuildDetails(buildData.lastBuild, buildData.scmName, remoteConfigs));
+            }
+        }
+
+        BuildDetails buildDetails = calculateBuildDetails(parent.getName(), parent.getFullName(), buildDetailsList);
+
+        if (buildDetails == null) {
+            throw new IOException(Messages.BuildDetailsHelper_NoBuildDataError());
+        }
+
+        // buildData?.lastBuild?.marked and fall back to .revision with null check everywhere to be defensive
+        Build b = buildDetails.getBuild();
+        if (b != null) {
+            Revision r = b.marked;
+            if (r == null) {
+                r = b.revision;
+            }
+            if (r != null) {
+                return r.getSha1();
+            }
+        }
+
+        // Nowhere to report => fail the build
+        throw new IOException(Messages.BuildDetailsHelper_NoLastRevisionError());
+    }
+}

src/main/java/org/jenkinsci/plugins/github/util/JobInfoHelpers.java

@@ -111,7 +111,7 @@ public static <T extends Trigger> T triggerFrom(Item item, Class<T> tClass) {
         if (item instanceof ParameterizedJobMixIn.ParameterizedJob) {
             ParameterizedJobMixIn.ParameterizedJob pJob = (ParameterizedJobMixIn.ParameterizedJob) item;
 
-            for (Trigger candidate : pJob.getTriggers().values()) {
+            for (Object candidate : pJob.getTriggers().values()) {
                 if (tClass.isInstance(candidate)) {
                     return tClass.cast(candidate);
                 }

src/main/resources/org/jenkinsci/plugins/github/util/Messages.properties

@@ -1,2 +1,2 @@
-BuildDataHelper.NoBuildDataError=Cannot retrieve Git metadata for the build
-BuildDataHelper.NoLastRevisionError=Cannot determine sha1 of the commit. The status cannot be reported
+BuildDetailsHelper.NoBuildDataError=Cannot retrieve Git metadata for the build
+BuildDetailsHelper.NoLastRevisionError=Cannot determine sha1 of the commit. The status cannot be reported