[maven-dist-tool] branch master updated: separate columns for GitHub, Jira and Jenkins job

[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 5b87d5e  separate columns for GitHub, Jira and Jenkins job
5b87d5e is described below

commit 5b87d5e9e2e262064fdb7a8e9a1bd882ee5a7c11
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Feb 13 22:19:39 2021 +0100

    separate columns for GitHub, Jira and Jenkins job
---
 .../dist/tools/branches/ListBranchesMojo.java      | 31 +++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java 
b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java
index 8495786..a151253 100644
--- a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java
@@ -302,7 +302,13 @@ public class ListBranchesMojo extends AbstractMavenReport
         sink.table();
         sink.tableRow();
         sink.tableHeaderCell();
-        sink.text( "Jenkins job / GitHub" );
+        sink.text( "GitHub" );
+        sink.tableHeaderCell_();
+        sink.tableHeaderCell();
+        sink.text( "JIRA" );
+        sink.tableHeaderCell_();
+        sink.tableHeaderCell();
+        sink.text( "Jenkins job" );
         sink.tableHeaderCell_();
         sink.tableHeaderCell();
         sink.text( "master" );
@@ -326,13 +332,24 @@ public class ListBranchesMojo extends AbstractMavenReport
             .forEach( r -> 
             {
                 sink.tableRow();
-                
+
+                // GitHub
                 sink.tableCell();
-                sink.link( r.getBuildUrl() );
+                sink.link( "https://github.com/apache/"; + 
r.getRepositoryName() );
                 sink.rawText( r.getRepositoryName() );
                 sink.link_();
-                sink.rawText( " / " );
-                sink.link( "https://github.com/apache/"; + 
r.getRepositoryName() );
+                sink.tableCell_();
+
+                // Jira
+                sink.tableCell();
+                sink.link( JIRA_BASE_URL + r.getRepositoryName() );
+                sink.rawText( JIRAPROJECTS.get( r.getRepositoryName() ) );
+                sink.link_();
+                sink.tableCell_();
+
+                // Jenkins job
+                sink.tableCell();
+                sink.link( r.getBuildUrl() );
                 sink.rawText( r.getRepositoryName() );
                 sink.link_();
                 sink.tableCell_();
@@ -344,10 +361,6 @@ public class ListBranchesMojo extends AbstractMavenReport
 
                 //jira branches
                 sink.tableCell();
-                sink.link( JIRA_BASE_URL + r.getRepositoryName() );
-                sink.rawText( JIRAPROJECTS.get( r.getRepositoryName() ) );
-                sink.link_();
-                sink.rawText( ": " );
                 if ( r.getJiraBranchesGit() == 0 ) 
                 {
                     sink.text( "-" );