Merge branch 'master' into migrate_to_junit5

# Conflicts:
#	src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java

Author: strangelookingnerd

Jenkinsfile

@@ -5,6 +5,6 @@
 buildPlugin(
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 21],
 ])

pom.xml

@@ -35,7 +35,7 @@
     <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
     <jenkins.baseline>2.504</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
     <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
   </properties>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>5294.va_d2e144c80e1</version>
+        <version>5543.vfd758c7c868d</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -92,15 +92,11 @@
     <dependency>
       <groupId>io.jenkins</groupId>
       <artifactId>configuration-as-code</artifactId>
-      <!-- TODO: remove when included in jenkins-bom via parent -->
-      <version>1995.v540b_50a_eb_0c1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.jenkins.configuration-as-code</groupId>
       <artifactId>test-harness</artifactId>
-      <!-- TODO: remove when included in jenkins-bom via parent -->
-      <version>1995.v540b_50a_eb_0c1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubBranchDetail.java

@@ -0,0 +1,42 @@
+package org.jenkinsci.plugins.github_branch_source;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.model.Actionable;
+import hudson.model.Run;
+import jenkins.model.details.Detail;
+import jenkins.model.details.DetailGroup;
+import jenkins.scm.api.SCMDetailGroup;
+import jenkins.scm.api.metadata.ObjectMetadataAction;
+
+public class GitHubBranchDetail extends Detail {
+    public GitHubBranchDetail(Actionable object) {
+        super(object);
+    }
+
+    @Nullable
+    @Override
+    public String getIconClassName() {
+        return "symbol-git-branch-outline plugin-ionicons-api";
+    }
+
+    @Nullable
+    @Override
+    public String getDisplayName() {
+        return getObjectMetadataAction().getObjectDisplayName();
+    }
+
+    @Override
+    public String getLink() {
+        return getObjectMetadataAction().getObjectUrl();
+    }
+
+    @Override
+    public DetailGroup getGroup() {
+        return SCMDetailGroup.get();
+    }
+
+    private ObjectMetadataAction getObjectMetadataAction() {
+        Run<?, ?> run = (Run<?, ?>) getObject();
+        return run.getParent().getAction(ObjectMetadataAction.class);
+    }
+}

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubCommitDetail.java

@@ -0,0 +1,75 @@
+package org.jenkinsci.plugins.github_branch_source;
+
+import hudson.model.Actionable;
+import hudson.model.Run;
+import jenkins.model.details.Detail;
+import jenkins.model.details.DetailGroup;
+import jenkins.plugins.git.AbstractGitSCMSource;
+import jenkins.scm.api.SCMDetailGroup;
+import jenkins.scm.api.SCMRevision;
+import jenkins.scm.api.SCMRevisionAction;
+
+public class GitHubCommitDetail extends Detail {
+    public GitHubCommitDetail(Actionable object) {
+        super(object);
+    }
+
+    public String getIconClassName() {
+        return "symbol-git-commit-outline plugin-ionicons-api";
+    }
+
+    @Override
+    public String getDisplayName() {
+        SCMRevision revision = getRevision();
+
+        if (revision == null) {
+            return null;
+        }
+
+        if (revision instanceof AbstractGitSCMSource.SCMRevisionImpl abstractRevision) {
+            return abstractRevision.getHash().substring(0, 7);
+        }
+
+        if (revision instanceof PullRequestSCMRevision pullRequestSCMRevision) {
+            return pullRequestSCMRevision.getPullHash().substring(0, 7);
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getLink() {
+        SCMRevision revision = getRevision();
+
+        if (revision == null) {
+            return null;
+        }
+
+        if (revision instanceof AbstractGitSCMSource.SCMRevisionImpl abstractRevision) {
+            return new GitHubRepositoryDetail(getObject()).getLink() + "/commit/" + abstractRevision.getHash();
+        }
+
+        if (revision instanceof PullRequestSCMRevision pullRequestSCMRevision) {
+            Run<?, ?> run = (Run<?, ?>) getObject();
+            GitHubLink repoLink = run.getParent().getAction(GitHubLink.class);
+            return repoLink.getUrl() + "/commits/" + pullRequestSCMRevision.getPullHash();
+        }
+
+        return null;
+    }
+
+    @Override
+    public DetailGroup getGroup() {
+        return SCMDetailGroup.get();
+    }
+
+    private SCMRevision getRevision() {
+        SCMRevisionAction scmRevisionAction = getObject().getAction(SCMRevisionAction.class);
+
+        if (scmRevisionAction == null) {
+            return null;
+        }
+
+        return scmRevisionAction.getRevision();
+    }
+}

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubDetailFactory.java

@@ -0,0 +1,53 @@
+package org.jenkinsci.plugins.github_branch_source;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.model.Run;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jenkins.model.details.Detail;
+import jenkins.model.details.DetailFactory;
+import jenkins.scm.api.SCMRevision;
+import jenkins.scm.api.SCMRevisionAction;
+import jenkins.scm.api.SCMSource;
+
+@Extension
+public final class GitHubDetailFactory extends DetailFactory<Run> {
+
+    @Override
+    public Class<Run> type() {
+        return Run.class;
+    }
+
+    @NonNull
+    @Override
+    public List<? extends Detail> createFor(@NonNull Run target) {
+        SCMSource src = SCMSource.SourceByItem.findSource(target.getParent());
+
+        // Don't add details for non-GitHub SCM sources
+        if (!(src instanceof GitHubSCMSource)) {
+            return Collections.emptyList();
+        }
+
+        SCMRevisionAction scmRevisionAction = target.getAction(SCMRevisionAction.class);
+
+        if (scmRevisionAction == null) {
+            return Collections.emptyList();
+        }
+
+        List<Detail> details = new ArrayList<>();
+        SCMRevision revision = scmRevisionAction.getRevision();
+
+        if (revision instanceof PullRequestSCMRevision) {
+            details.add(new GitHubPullRequestDetail(target));
+        } else {
+            details.add(new GitHubBranchDetail(target));
+        }
+
+        details.add(new GitHubCommitDetail(target));
+        details.add(new GitHubRepositoryDetail(target));
+
+        return details;
+    }
+}

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubPullRequestDetail.java

@@ -0,0 +1,42 @@
+package org.jenkinsci.plugins.github_branch_source;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.model.Actionable;
+import hudson.model.Run;
+import jenkins.model.details.Detail;
+import jenkins.model.details.DetailGroup;
+import jenkins.scm.api.SCMDetailGroup;
+import jenkins.scm.api.metadata.ObjectMetadataAction;
+
+public class GitHubPullRequestDetail extends Detail {
+    public GitHubPullRequestDetail(Actionable object) {
+        super(object);
+    }
+
+    @Nullable
+    @Override
+    public String getIconClassName() {
+        return "symbol-git-pull-request-outline plugin-ionicons-api";
+    }
+
+    @Nullable
+    @Override
+    public String getDisplayName() {
+        return getObjectMetadataAction().getObjectDisplayName();
+    }
+
+    @Override
+    public String getLink() {
+        return getObjectMetadataAction().getObjectUrl();
+    }
+
+    @Override
+    public DetailGroup getGroup() {
+        return SCMDetailGroup.get();
+    }
+
+    private ObjectMetadataAction getObjectMetadataAction() {
+        Run<?, ?> run = (Run<?, ?>) getObject();
+        return run.getParent().getAction(ObjectMetadataAction.class);
+    }
+}

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepositoryDetail.java

@@ -0,0 +1,59 @@
+package org.jenkinsci.plugins.github_branch_source;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.model.Actionable;
+import hudson.model.Run;
+import jenkins.model.details.Detail;
+import jenkins.model.details.DetailGroup;
+import jenkins.scm.api.SCMDetailGroup;
+import jenkins.scm.api.SCMSource;
+
+public class GitHubRepositoryDetail extends Detail {
+    public GitHubRepositoryDetail(Actionable object) {
+        super(object);
+    }
+
+    @Nullable
+    @Override
+    public String getIconClassName() {
+        return "symbol-logo-github plugin-ionicons-api";
+    }
+
+    @Nullable
+    @Override
+    public String getDisplayName() {
+        GitHubSCMSource source = getSCMSource();
+
+        if (source == null) {
+            return null;
+        }
+
+        return source.getRepoOwner() + "/" + source.getRepository();
+    }
+
+    @Override
+    public String getLink() {
+        GitHubSCMSource source = getSCMSource();
+
+        if (source == null) {
+            return null;
+        }
+
+        return source.getRepositoryUrl();
+    }
+
+    @Override
+    public DetailGroup getGroup() {
+        return SCMDetailGroup.get();
+    }
+
+    private GitHubSCMSource getSCMSource() {
+        var source = SCMSource.SourceByItem.findSource(((Run) getObject()).getParent());
+
+        if (source instanceof GitHubSCMSource githubSource) {
+            return githubSource;
+        }
+
+        return null;
+    }
+}

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java

@@ -65,6 +65,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import jenkins.model.Jenkins;
 import jenkins.plugins.git.traits.GitBrowserSCMSourceTrait;
 import jenkins.scm.api.SCMNavigator;
@@ -1134,8 +1136,25 @@ public void visitSources(SCMSourceObserver observer) throws IOException, Interru
                     } else {
                         repositories = org.listRepositories(100);
                     }
+
+                    List<String> repoList = StreamSupport.stream(repositories.spliterator(), false)
+                            .map(GHRepository::getName)
+                            .collect(Collectors.toList());
+
+                    String repoString = String.join(",", repoList);
+
+                    listener.getLogger()
+                            .println(GitHubConsoleNote.create(
+                                    System.currentTimeMillis(),
+                                    String.format("Found %d repositories: %s", repoList.size(), repoString)));
+
                     for (GHRepository repo : repositories) {
                         try {
+                            listener.getLogger()
+                                    .println(GitHubConsoleNote.create(
+                                            System.currentTimeMillis(),
+                                            String.format("Processing repository: %s", repo.getName())));
+
                             if (repo.isArchived() && gitHubSCMNavigatorContext.isExcludeArchivedRepositories()) {
                                 // exclude archived repositories
                                 witness.record(repo.getName(), false);
@@ -1306,7 +1325,8 @@ private Iterable<GHRepository> searchRepositories(final GitHub github, final Git
         if (!context.isExcludeForkedRepositories()) {
             ghRepositorySearchBuilder.q("fork:true");
         }
-        return ghRepositorySearchBuilder.list().withPageSize(100);
+        ghRepositorySearchBuilder.q("sort:name-asc");
+        return ghRepositorySearchBuilder.list().withPageSize(100).asList();
     }
 
     private GHOrganization getGhOrganization(final GitHub github) throws IOException {
@@ -1696,7 +1716,7 @@ public void afterSave(@NonNull SCMNavigatorOwner owner) {
             } finally {
                 Connector.release(hub);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             DescriptorImpl.LOGGER.log(Level.WARNING, e.getMessage(), e);
         }
     }