From edcba79af5ab943a326bfac9258bf7fe5980013c Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Thu, 21 Jul 2022 18:03:20 +0200
Subject: [PATCH] [MPLUGIN-501] Upgrade to Doxia 2.0.0 Milestone Stack

This closes #212
---
 maven-plugin-report-plugin/pom.xml            |  9 +++---
 .../plugin-report-with-javadoc-links/pom.xml  |  3 --
 .../src/main/java/org/DummyReport.java        |  1 -
 .../plugin/plugin/report/GoalRenderer.java    |  4 +--
 .../plugin/report/PluginOverviewRenderer.java |  2 +-
 .../plugin/plugin/report/PluginReport.java    |  2 --
 maven-plugin-tools-generators/pom.xml         |  2 +-
 .../test/resources/expected-testGoal-mojo.xml |  8 +++---
 pom.xml                                       | 28 ++++---------------
 9 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index e1ad2404..7f923129 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -39,7 +39,7 @@
 
   <properties>
     <it.debug>true</it.debug>
-    <doxiaVersion>1.11.1</doxiaVersion>
+    <doxiaVersion>2.0.0-M12</doxiaVersion>
   </properties>
 
   <dependencies>
@@ -120,8 +120,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
-      <!--same version as used by doxia site renderer -->
+      <version>3.16.0</version>
     </dependency>
     <!-- Plexus -->
     <dependency>
@@ -271,8 +270,8 @@
               <settingsFile>src/it/settings.xml</settingsFile>
               <streamLogsOnFailures>true</streamLogsOnFailures>
               <filterProperties>
-                <sitePluginVersion>3.12.1</sitePluginVersion>
-                <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
+                <sitePluginVersion>3.20.0</sitePluginVersion>
+                <projectInfoReportsPlugin>3.7.0</projectInfoReportsPlugin>
               </filterProperties>
               <properties>
                 <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index 98beacbf..608f08ca 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
@@ -101,9 +101,6 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <version>@sitePluginVersion@</version>
-        <configuration>
-          <locales>en</locales>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
index 66315bcd..1ac5ad70 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
@@ -108,7 +108,6 @@ protected MavenProject getProject() {
      */
     public boolean canGenerateReport() {
         if (skip || skipReport) {
-            getLog().info("Maven Plugin Plugin Report generation skipped.");
             return false;
         }
 
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
index 71a62f10..20d2ea45 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/GoalRenderer.java
@@ -37,7 +37,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet.Semantics;
-import org.apache.maven.doxia.util.HtmlTools;
+import org.apache.maven.doxia.util.DoxiaUtils;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.logging.Log;
@@ -260,7 +260,7 @@ private void renderParameterOverviewTableRow(Parameter parameter) {
         renderTableCellWithCode(
                 format("parameter.name", parameter.getName()),
                 // no need for additional URI encoding as it returns only URI safe characters
-                Optional.of("#" + HtmlTools.encodeId(parameter.getName())));
+                Optional.of("#" + DoxiaUtils.encodeId(parameter.getName())));
 
         // type
         Map.Entry<String, Optional<String>> type = getLinkedType(parameter, true);
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
index d557ed7f..9b810ca1 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginOverviewRenderer.java
@@ -326,7 +326,7 @@ private void renderUsageSection(boolean hasMavenReport) {
         sb.append("  ...").append(Markup.EOL);
         sb.append("</project>");
 
-        verbatimText(sb.toString());
+        verbatimSource(sb.toString());
 
         sink.paragraph();
         linkPatternedText(getI18nString("configuration.end"));
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
index 6c747f4e..a9a0cb3d 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
@@ -163,7 +163,6 @@ public class PluginReport extends AbstractMavenReport {
     @Override
     public boolean canGenerateReport() {
         if (skip) {
-            getLog().info("Maven Plugin Plugin Report generation skipped.");
             return false;
         }
 
@@ -273,7 +272,6 @@ public String getOutputName() {
      */
     private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
             throws MavenReportException {
-
         if (pluginDescriptor.getMojos() != null) {
             for (MojoDescriptor descriptor : pluginDescriptor.getMojos()) {
                 GoalRenderer renderer;
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 7ac04b6d..e60d81f9 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -83,7 +83,7 @@
     <!-- other -->
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
+      <artifactId>velocity-engine-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml b/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
index 331787cb..ced84938 100644
--- a/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
+++ b/maven-plugin-tools-generators/src/test/resources/expected-testGoal-mojo.xml
@@ -47,7 +47,7 @@
         </li>
       </ul>
       <subsection name="Required Parameters">
-        <table border="0" class="bodyTable">
+        <table class="bodyTable">
           <tr>
             <th>Name</th>
             <th>Type</th>
@@ -81,7 +81,7 @@
         </table>
       </subsection>
       <subsection name="Optional Parameters">
-        <table border="0" class="bodyTable">
+        <table class="bodyTable">
           <tr>
             <th>Name</th>
             <th>Type</th>
@@ -109,7 +109,7 @@
       <subsection name="Parameter Details">
         <h4>
           <strong>
-            <a name="dir">&lt;dir&gt;</a>
+            <a id="dir">&lt;dir&gt;</a>
           </strong>
         </h4>
         <div>Test parameter description</div>
@@ -142,7 +142,7 @@
         <hr/>
         <h4>
           <strong>
-            <a name="withoutSince">&lt;withoutSince&gt;</a>
+            <a id="withoutSince">&lt;withoutSince&gt;</a>
           </strong>
         </h4>
         <div>(no description)</div>
diff --git a/pom.xml b/pom.xml
index 327fb913..79c7cec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,10 +101,10 @@
     <asmVersion>9.7</asmVersion>
     <plexusUtilsVersion>4.0.1</plexusUtilsVersion>
     <plexusXmlVersion>3.0.1</plexusXmlVersion>
-    <reportingApiVersion>3.1.1</reportingApiVersion>
-    <reportingImplVersion>3.2.0</reportingImplVersion>
+    <reportingApiVersion>4.0.0-M12</reportingApiVersion>
+    <reportingImplVersion>4.0.0-M15</reportingImplVersion>
     <compilerPluginVersion>3.11.0</compilerPluginVersion>
-    <javadocPluginVersion>3.5.0</javadocPluginVersion>
+    <javadocPluginVersion>3.8.0</javadocPluginVersion>
     <version.maven-invoker-plugin>3.7.0</version.maven-invoker-plugin>
     <enforcerPluginVersion>3.5.0</enforcerPluginVersion>
     <project.build.outputTimestamp>2024-06-26T07:46:19Z</project.build.outputTimestamp>
@@ -183,12 +183,6 @@
         <groupId>org.apache.maven.reporting</groupId>
         <artifactId>maven-reporting-impl</artifactId>
         <version>${reportingImplVersion}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
 
       <dependency>
@@ -220,24 +214,14 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-velocity</artifactId>
-        <version>1.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>2.1.0</version>
       </dependency>
 
       <!-- other -->
       <dependency>
         <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity</artifactId>
-        <version>1.7</version>
+        <artifactId>velocity-engine-core</artifactId>
+        <version>2.3</version>
       </dependency>
 
       <dependency>