Fix ReportGenerator for new doxia stack

mojohaus · Jun 29, 2024 · 925689a · 925689a
1 parent b921b44
commit 925689a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 31 deletions.
diff --git a/src/main/java/org/codehaus/mojo/taglist/ReportGenerator.java b/src/main/java/org/codehaus/mojo/taglist/ReportGenerator.java
@@ -122,6 +122,8 @@ private void doSummarySection(Collection<TagReport> tagReports) {
  sink.paragraph_();
 
  sink.table();
+ sink.tableRows(new int[] {}, false);
+
  sink.tableRow();
  sink.tableHeaderCell();
  sink.text(bundle.getString("report.taglist.summary.tag"));
@@ -133,9 +135,11 @@ private void doSummarySection(Collection<TagReport> tagReports) {
  sink.text(bundle.getString("report.taglist.summary.tagstrings"));
  sink.tableHeaderCell_();
  sink.tableRow_();
+
  for (TagReport tagReport : tagReports) {
  doTagSummary(tagReport);
  }
+ sink.tableRows_();
  sink.table_();
  }
 
@@ -213,10 +217,13 @@ private void doTagDetailedPart(TagReport tagReport) {
  // MTAGLIST-38 - sink table before generating each file report in order
  // to align the columns correctly.
  sink.table();
+ sink.tableRows(new int[] {}, false);
 
  for (FileReport sortedFileReport : sortedFileReports) {
  doFileDetailedPart(sortedFileReport);
  }
+
+ sink.tableRows_();
  sink.table_();
 
  sink.section2_();

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -1,41 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.10.0</version>
- </skin>
- <custom>
- <fluidoSkin>
- <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
- <copyrightClass>pull-right</copyrightClass>
- <gitHub>
- <projectId>mojohaus/taglist-maven-plugin</projectId>
- <ribbonOrientation>right</ribbonOrientation>
- <ribbonColor>black</ribbonColor>
- <profile>production</profile>
- </gitHub>
- </fluidoSkin>
- </custom>
+<project xmlns="http://maven.apache.org/DECORATION/1.8.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd">
  <body>
- <links>
- <item name="MojoHaus" href="https://www.mojohaus.org/"/>
- <item name="Maven" href="https://maven.apache.org/"/>
- </links>
+
  <breadcrumbs>
- <item name="MojoHaus" href="https://www.mojohaus.org/"/>
- <item name="${this.name}" href="${this.url}"/>
+ <item name="MojoHaus" href="https://www.mojohaus.org/" />
+ <item name="${this.name}" href="${this.url}" />
  </breadcrumbs>
+
  <menu name="Overview">
- <item name="Introduction" href="./index.html"/>
- <item name="Goals" href="./plugin-info.html"/>
- <item name="Usage" href="./usage.html"/>
- <item name="FAQ" href="./faq.html"/>
+ <item name="Introduction" href="./index.html" />
+ <item name="Goals" href="./plugin-info.html" />
+ <item name="Usage" href="./usage.html" />
+ <item name="FAQ" href="./faq.html" />
  </menu>
+
  <menu name="Examples">
- <item name="Counting Tags" href="./examples/counting-tags.html"/>
- <item name="Sample Taglist Report" href="./taglist.html"/>
+ <item name="Counting Tags" href="./examples/counting-tags.html" />
+ <item name="Sample Taglist Report" href="./taglist.html" />
  </menu>
- <menu ref="reports" inherit="bottom"/>
  </body>
 </project>