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 69275bd fix broken tables after Doxia 2 upgrade
69275bd is described below
commit 69275bdebe70ac2894fbb8be928c694e4573899a
Author: Hervé Boutemy <[email protected]>
AuthorDate: Sat Jun 10 09:43:09 2023 +0200
fix broken tables after Doxia 2 upgrade
see
https://cwiki.apache.org/confluence/display/MAVEN/Towards+Doxia+2.0.0+Stack#TowardsDoxia2.0.0Stack-MigrationNotes
---
.../maven/dist/tools/jobs/branches/ListBranchesReport.java | 2 ++
.../tools/prerequisites/ListPluginsPrerequisitesReport.java | 10 ++++++++++
.../org/apache/maven/dist/tools/site/DistCheckSiteReport.java | 2 ++
.../maven/dist/tools/source/DistCheckSourceReleaseReport.java | 3 +++
4 files changed, 17 insertions(+)
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 1ec03cd..ec5e03c 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
@@ -288,6 +288,7 @@ public class ListBranchesReport extends AbstractJobsReport {
sink.paragraph();
sink.table();
+ sink.tableRows(null, true);
sink.tableRow();
sink.tableHeaderCell();
sink.text("Repository");
@@ -490,6 +491,7 @@ public class ListBranchesReport extends AbstractJobsReport {
sink.tableHeaderCell_();
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
sink.body_();
}
diff --git
a/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
b/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
index 0679b34..90efb11 100644
---
a/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
+++
b/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
@@ -70,6 +70,15 @@ public class ListPluginsPrerequisitesReport extends
AbstractMavenReport {
sink.body();
sink.table();
+ int[] justif = new int[] {
+ Sink.JUSTIFY_RIGHT,
+ Sink.JUSTIFY_LEFT,
+ Sink.JUSTIFY_CENTER,
+ Sink.JUSTIFY_CENTER,
+ Sink.JUSTIFY_CENTER,
+ Sink.JUSTIFY_LEFT
+ };
+ sink.tableRows(justif, true);
prerequisites.getGroupedPrequisites().entrySet().stream()
.sorted(Map.Entry.comparingByKey())
.forEachOrdered(plugin -> {
@@ -144,6 +153,7 @@ public class ListPluginsPrerequisitesReport extends
AbstractMavenReport {
}
});
+ sink.tableRows_();
sink.table_();
sink.body_();
}
diff --git
a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
index 2cc6172..427a06b 100644
--- a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
@@ -140,6 +140,7 @@ public class DistCheckSiteReport extends
AbstractDistCheckReport {
sink.rawText("All sun icons in one column is kind of objective.");
sink.section1_();
sink.table();
+ sink.tableRows(null, true);
sink.tableRow();
sink.tableHeaderCell();
sink.rawText("groupId/artifactId");
@@ -213,6 +214,7 @@ public class DistCheckSiteReport extends
AbstractDistCheckReport {
sink.tableRow_();
}
+ sink.tableRows_();
sink.table_();
sink.body_();
sink.flush();
diff --git
a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
index 3a8ba66..eb1f61c 100644
---
a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
+++
b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
@@ -293,7 +293,9 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
sink.text("Older artifacts exploration is Work In Progress...");
sink.paragraph_();
sink.section1_();
+
sink.table();
+ sink.tableRows(null, true);
sink.tableRow();
sink.tableHeaderCell();
sink.rawText("groupId/artifactId: " +
String.valueOf(stats.artifactsCount));
@@ -333,6 +335,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
reportLine(sink, csrr);
}
+ sink.tableRows_();
sink.table_();
sink.body_();
sink.flush();