[maven-dist-tool] branch master updated: read branches list from GitHub

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git


The following commit(s) were added to refs/heads/master by this push:
     new f9702f4  read branches list from GitHub
f9702f4 is described below

commit f9702f49baaa7c12c44de4cfc205de1b545a656b
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sun Jun 4 19:48:48 2023 +0200

    read branches list from GitHub
---
 .../tools/jobs/branches/ListBranchesReport.java    | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/dist/tools/jobs/branches/ListBranchesReport.java
 
b/src/main/java/org/apache/maven/dist/tools/jobs/branches/ListBranchesReport.java
index 67acb6a..1ec03cd 100644
--- 
a/src/main/java/org/apache/maven/dist/tools/jobs/branches/ListBranchesReport.java
+++ 
b/src/main/java/org/apache/maven/dist/tools/jobs/branches/ListBranchesReport.java
@@ -41,6 +41,7 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.reporting.MavenReportException;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
 /**
  * Generate report with build status of the Jenkins job for the master branch 
of every Git repository in
@@ -185,16 +186,16 @@ public class ListBranchesReport extends 
AbstractJobsReport {
         List<Result> repoStatus = new ArrayList<>(repositoryNames.size());
 
         for (String repository : repositoryNames) {
-            final String gitboxHeadsUrl = getGitboxHeadsUrl(repository);
+            final String githubBranchesUrl = getGitHubBranchesUrl(repository);
             final String repositoryJobUrl = MAVENBOX_JOBS_BASE_URL + 
repository;
 
             try {
-                Document gitboxHeadsDoc = JsoupRetry.get(gitboxHeadsUrl);
+                Document githubBranchesDoc = JsoupRetry.get(githubBranchesUrl);
 
-                Element headsTable = gitboxHeadsDoc.selectFirst("table.heads");
+                Elements branchItems = 
githubBranchesDoc.select("branch-filter-item");
 
-                if (headsTable == null) {
-                    getLog().warn("Ignoring " + repository + ": unexpected 
content from " + gitboxHeadsUrl);
+                if (branchItems.size() == 0) {
+                    getLog().warn("Ignoring " + repository + ": no 
branch-filter-item found in " + githubBranchesUrl);
                     continue;
                 }
 
@@ -210,8 +211,8 @@ public class ListBranchesReport extends AbstractJobsReport {
                 Collection<String> restGit = new ArrayList<>();
                 Collection<String> restJenkins = new ArrayList<>();
 
-                for (Element tableRow : headsTable.select("tr")) {
-                    String name = tableRow.selectFirst("a.name").text();
+                for (Element branchItem : branchItems) {
+                    String name = branchItem.attr("branch");
 
                     if ("master".equals(name)) {
                         masterBranchesGit++;
@@ -255,8 +256,8 @@ public class ListBranchesReport extends AbstractJobsReport {
         generateReport(repoStatus);
     }
 
-    private String getGitboxHeadsUrl(String repository) {
-        return GITBOX_URL + "?p=" + repository + ".git;a=heads";
+    private String getGitHubBranchesUrl(String repository) {
+        return GITHUB_URL + repository + "/branches/all";
     }
 
     private void generateReport(List<Result> repoStatus) {
@@ -369,7 +370,7 @@ public class ListBranchesReport extends AbstractJobsReport {
                         
sink.rawText(String.valueOf(r.getJiraBranchesJenkins().size()));
                         sink.link_();
                         sink.text(" / ");
-                        sink.link(getGitboxHeadsUrl(r.getRepositoryName()), 
gitLinkAttributes);
+                        sink.link(getGitHubBranchesUrl(r.getRepositoryName()), 
gitLinkAttributes);
                         
sink.rawText(String.valueOf(r.getJiraBranchesGit().size()));
                         sink.link_();
                         sink.bold_();
@@ -408,7 +409,7 @@ public class ListBranchesReport extends AbstractJobsReport {
                                 
String.valueOf(r.getDependabotBranchesJenkins().size()));
                         sink.link_();
                         sink.text(" / ");
-                        sink.link(getGitboxHeadsUrl(r.getRepositoryName()), 
gitLinkAttributes);
+                        sink.link(getGitHubBranchesUrl(r.getRepositoryName()), 
gitLinkAttributes);
                         
sink.rawText(String.valueOf(r.getDependabotBranchesGit().size()));
                         sink.link_();
 
@@ -441,7 +442,7 @@ public class ListBranchesReport extends AbstractJobsReport {
                         
sink.rawText(String.valueOf(r.getRestJenkins().size()));
                         sink.link_();
                         sink.text(" / ");
-                        sink.link(getGitboxHeadsUrl(r.getRepositoryName()), 
gitLinkAttributes);
+                        sink.link(getGitHubBranchesUrl(r.getRepositoryName()), 
gitLinkAttributes);
                         sink.rawText(String.valueOf(r.getRestGit().size()));
                         sink.link_();