You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/06/05 20:06:32 UTC

[maven-plugin-tools] branch doxia-2.0.0 updated (b4659c54 -> d6fb87bb)

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

michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git


    omit b4659c54 Prepare for Doxia 2.0.0
     add 1dcccaf2 [MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#214)
     add 8c2f8a35 [MPLUGIN-467] Remove reporting from maven-plugin-plugin
     add ee9b35d1 [MPLUGIN-468] Upgrade plugins and components (in ITs)
     add bf04d073 [MPLUGIN-469] Omit empty line in generated help goal output if plugin description is empty
     add ca911b2d [MPLUGIN-470] *-mojo.xml (in PluginXdocGenerator) is overwritten when multiple locales are defined
     add 63a14f72 [MPLUGIN-471] Generated table by PluginXdocGenerator does not contain default attributes
     add 0db6c1a1 Simplify code
     add 6ece803d Remove superfluous site descriptor
     add 0a8d0cb4 [MPLUGIN-472] Use Plexus I18N rather than fiddling with resource bundles directly
     add 15ad4b55 [maven-release-plugin] prepare release maven-plugin-tools-3.9.0
     add 5b36e3d5 [maven-release-plugin] prepare for next development iteration
     add d1f39362 Use proper scope for method
     new d6fb87bb Prepare for Doxia 2.0.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b4659c54)
            \
             N -- N -- N   refs/heads/doxia-2.0.0 (d6fb87bb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 maven-plugin-annotations/pom.xml                   |   2 +-
 maven-plugin-plugin/pom.xml                        |   2 +-
 .../annotation-with-inheritance-from-deps/pom.xml  |   6 +-
 .../it/annotation-with-inheritance-reactor/pom.xml |   2 +-
 .../src/it/annotation-with-inheritance/pom.xml     |   6 +-
 .../expected-help.txt                              |   5 +-
 .../invoker.properties                             |   6 +-
 .../help-basic-deprecated-annotation-only/pom.xml  |   4 +-
 .../verify.groovy                                  |   2 +-
 .../src/it/help-basic-jdk11/expected-help.txt      |   1 -
 .../src/it/help-basic-jdk11/pom.xml                |   2 +-
 .../src/it/help-basic/expected-help.txt            |   1 -
 maven-plugin-plugin/src/it/help-basic/pom.xml      |   2 +-
 maven-plugin-plugin/src/it/help-package/pom.xml    |   2 +-
 .../src/it/java-basic-annotations-jdk8/pom.xml     |   6 +-
 .../it/java-basic-annotations-jdkcurrent/pom.xml   |   6 +-
 .../src/it/java-basic-annotations/pom.xml          |   6 +-
 maven-plugin-plugin/src/it/mplugin-223/pom.xml     |   2 +-
 .../src/it/mplugin-272_java8/pom.xml               |   2 +-
 .../src/it/mplugin-299_no-configuration/pom.xml    |   2 +-
 .../it/mplugin-305_defaultMojoDependencies/pom.xml |   2 +-
 .../it/mplugin-305_emptyMojoDependencies/pom.xml   |   2 +-
 .../it/mplugin-305_singleMojoDependencies/pom.xml  |   4 +-
 .../plugins/plugin/it/CustomSurefireMojo.java      |  97 ++++++++++--
 .../verify.groovy                                  |   2 +-
 .../src/it/mplugin-324_javadoc/pom.xml             |   4 +-
 .../src/it/mplugin-363_help-reproducible/pom.xml   |   4 +-
 .../it/mplugin-370-maven-deps-scope-bad/pom.xml    |   2 +-
 .../it/mplugin-370-maven-deps-scope-good/pom.xml   |   4 +-
 .../pom.xml                                        |   6 +-
 .../pom.xml                                        |   2 +-
 maven-plugin-plugin/src/it/mplugin-390/pom.xml     |   4 +-
 maven-plugin-plugin/src/it/packaging-jar/pom.xml   |   2 +-
 maven-plugin-plugin/src/it/v4api/pom.xml           |   2 +-
 maven-plugin-report-plugin/pom.xml                 |   8 +-
 .../src/it/mplugin-191/pom.xml                     | 170 ++++++++++----------
 .../src/it/mplugin-319_report-since/pom.xml        | 176 ++++++++++-----------
 .../src/main/java/org/DummyReport.java             |   2 +-
 .../it/plugin-report-with-javadoc-links/pom.xml    |   2 +-
 .../src/main/java/org/DummyReport.java             |   2 +-
 .../maven/plugin/plugin/report/PluginReport.java   |   2 +-
 maven-plugin-tools-annotations/pom.xml             |   2 +-
 .../JavaAnnotationsMojoDescriptorExtractor.java    |   4 +-
 .../scanner/visitors/MojoClassVisitor.java         |   2 +-
 maven-plugin-tools-api/pom.xml                     |   2 +-
 .../tools/plugin/DefaultPluginToolsRequest.java    |   3 +-
 .../AbstractScriptedMojoDescriptorExtractor.java   |   3 +-
 .../tools/plugin/javadoc/JavadocReference.java     |   4 +-
 .../tools/plugin/scanner/DefaultMojoScanner.java   |   3 +-
 .../maven/tools/plugin/util/PluginUtils.java       |   2 +-
 maven-plugin-tools-generators/pom.xml              |   2 +-
 .../tools/plugin/generator/GeneratorUtils.java     |  14 +-
 .../generator/PluginDescriptorFilesGenerator.java  |   6 +-
 .../plugin/generator/PluginHelpGenerator.java      |   3 +-
 .../plugin/generator/PluginXdocGenerator.java      |  20 +--
 .../src/main/resources/help-class-source-v4.vm     |   6 +-
 .../src/main/resources/help-class-source.vm        |  30 ++--
 maven-plugin-tools-java/pom.xml                    |   2 +-
 .../JavaJavadocMojoDescriptorExtractor.java        |  21 ++-
 maven-script/maven-plugin-tools-ant/pom.xml        |   2 +-
 .../extractor/ant/AntMojoDescriptorExtractor.java  |   3 +-
 maven-script/maven-plugin-tools-beanshell/pom.xml  |   2 +-
 maven-script/maven-plugin-tools-model/pom.xml      |   2 +-
 .../extractor/model/PluginMetadataParser.java      |   2 +-
 maven-script/maven-script-ant/pom.xml              |   2 +-
 maven-script/maven-script-beanshell/pom.xml        |   2 +-
 maven-script/pom.xml                               |   2 +-
 pom.xml                                            |  14 +-
 68 files changed, 400 insertions(+), 326 deletions(-)


[maven-plugin-tools] 01/01: Prepare for Doxia 2.0.0

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git

commit d6fb87bbb4510c76d05cde551c5e3c88b2a0b19b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 21 18:03:20 2022 +0200

    Prepare for Doxia 2.0.0
---
 maven-plugin-annotations/pom.xml                   |  2 +-
 maven-plugin-plugin/pom.xml                        |  2 +-
 maven-plugin-report-plugin/pom.xml                 | 14 ++++++++++----
 .../it/plugin-report-with-javadoc-links/pom.xml    |  3 ---
 .../plugin-report-with-javadoc-links/verify.groovy |  4 ++--
 .../src/it/plugin-report/pom.xml                   |  2 +-
 .../maven/plugin/plugin/report/PluginReport.java   |  9 ++++-----
 maven-plugin-tools-annotations/pom.xml             |  2 +-
 maven-plugin-tools-api/pom.xml                     |  2 +-
 maven-plugin-tools-generators/pom.xml              |  4 ++--
 .../plugin/generator/PluginXdocGenerator.java      | 19 +++++--------------
 .../src/main/resources/pluginxdoc.properties       |  2 +-
 .../src/test/resources/expected-testGoal-mojo.xml  |  8 ++++----
 maven-plugin-tools-java/pom.xml                    |  2 +-
 maven-script/maven-plugin-tools-ant/pom.xml        |  2 +-
 maven-script/maven-plugin-tools-beanshell/pom.xml  |  2 +-
 maven-script/maven-plugin-tools-model/pom.xml      |  2 +-
 maven-script/maven-script-ant/pom.xml              |  2 +-
 maven-script/maven-script-beanshell/pom.xml        |  2 +-
 maven-script/pom.xml                               |  2 +-
 pom.xml                                            | 22 ++++++----------------
 21 files changed, 46 insertions(+), 63 deletions(-)

diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml
index 07af86b6..6b85586d 100644
--- a/maven-plugin-annotations/pom.xml
+++ b/maven-plugin-annotations/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-annotations</artifactId>
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index d648e953..3e22379a 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index 04cdf80e..ed726809 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.plugins</groupId>
@@ -86,7 +86,12 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
-      <version>1.11.1</version>
+      <version>2.0.0-M6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-integration-tools</artifactId>
+      <version>2.0.0-M10</version>
     </dependency>
 
     <!-- shared -->
@@ -243,8 +248,9 @@
               <settingsFile>src/it/settings.xml</settingsFile>
               <streamLogsOnFailures>true</streamLogsOnFailures>
               <filterProperties>
-                <sitePluginVersion>3.12.1</sitePluginVersion>
-                <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
+                <sitePluginVersion>4.0.0-M8</sitePluginVersion>
+                <projectInfoReportsPlugin>4.0.0-M1-SNAPSHOT</projectInfoReportsPlugin>
+                <compilerPluginVersion>3.11.0</compilerPluginVersion>
                 <antVersion>${antVersion}</antVersion>
               </filterProperties>
               <properties>
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 cabb67cf..b7162360 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
@@ -100,9 +100,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-with-javadoc-links/verify.groovy b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/verify.groovy
index 5eb43a12..9c040f6e 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/verify.groovy
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/verify.groovy
@@ -21,11 +21,11 @@ def mojoDoc = new File( basedir, 'target/site/test-mojo.html' )
 
 assert mojoDoc.isFile()
 
-assert mojoDoc.text.contains('<b>See also:</b> <a class="externalLink" href="https://docs.oracle.com/javase/8/docs/api/java/util/Collections.html">java.util.Collections</a></div>') // mojo description see javadoc tag
+assert mojoDoc.text.contains('<strong>See also:</strong> <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collections.html" class="externalLink">java.util.Collections</a></div>') // mojo description see javadoc tag
 
 assert mojoDoc.text.contains('beans parameter leveraging <a href="apidocs/org/SimpleBean.html"><code>SimpleBean</code></a>.') // parameter description
 assert mojoDoc.text.contains('<td><code><a href="apidocs/org/SimpleBean.html">Collection&lt;SimpleBean&gt;</a></code></td>') // type link in parameter overview
-assert mojoDoc.text.contains('<li><b>Type</b>: <code><a href="apidocs/org/SimpleBean.html">java.util.Collection&lt;org.SimpleBean&gt;</a></code></li>') // type link in parameter details
+assert mojoDoc.text.contains('<li><strong>Type</strong>: <code><a href="apidocs/org/SimpleBean.html">java.util.Collection&lt;org.SimpleBean&gt;</a></code></li>') // type link in parameter details
 
 assert mojoDoc.text.contains('<div>invalid javadoc reference <code>org.apache.maven.artifact.Artifact</code>.</div>') // second parameter description with link being removed (as no javadoc site associated)
 
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
index a6559802..1dcc9937 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
@@ -91,7 +91,7 @@ under the License.
         <artifactId>maven-site-plugin</artifactId>
         <version>@sitePluginVersion@</version>
         <configuration>
-          <locales>en,de,fr</locales>
+          <locales>default,de,fr</locales>
         </configuration>
       </plugin>
     </plugins>
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 c9a17406..33fc704c 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
@@ -238,6 +238,9 @@ public class PluginReport extends AbstractMavenReport {
     private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
             throws MavenReportException {
         try {
+            PluginXdocGenerator generator = new PluginXdocGenerator(
+                    getProject(), locale, getReportOutputDirectory(), disableInternalJavadocLinkValidation);
+            PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest(getProject(), pluginDescriptor);
             File outputDir;
             if (!locale.equals(SiteTool.DEFAULT_LOCALE)) {
                 outputDir = new File(new File(generatedSiteDirectory, locale.toString()), "xdoc");
@@ -245,10 +248,6 @@ public class PluginReport extends AbstractMavenReport {
                 outputDir = new File(generatedSiteDirectory, "xdoc");
             }
             outputDir.mkdirs();
-
-            PluginXdocGenerator generator = new PluginXdocGenerator(
-                    getProject(), locale, getReportOutputDirectory(), disableInternalJavadocLinkValidation);
-            PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest(getProject(), pluginDescriptor);
             generator.execute(outputDir, pluginToolsRequest);
         } catch (GeneratorException e) {
             throw new MavenReportException("Error writing plugin documentation", e);
@@ -524,7 +523,7 @@ public class PluginReport extends AbstractMavenReport {
             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-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index fc03afba..35ffa515 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-annotations</artifactId>
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index d4c9bc9c..bd4fb385 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-api</artifactId>
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 1198e807..ef09e337 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-generators</artifactId>
@@ -62,7 +62,7 @@
     <!-- other -->
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
+      <artifactId>velocity-engine-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
index 047355c7..0820854e 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -81,7 +81,7 @@ public class PluginXdocGenerator implements Generator {
     private final boolean disableInternalJavadocLinkValidation;
 
     /**
-     * Default constructor using <code>Locale.ENGLISH</code> as locale.
+     * Default constructor using <code>Locale.ROOT</code> as locale.
      * Used only in test cases.
      */
     public PluginXdocGenerator() {
@@ -89,12 +89,12 @@ public class PluginXdocGenerator implements Generator {
     }
 
     /**
-     * Constructor using <code>Locale.ENGLISH</code> as locale.
+     * Constructor using <code>Locale.ROOT</code> as locale.
      *
      * @param project not null Maven project.
      */
     public PluginXdocGenerator(MavenProject project) {
-        this(project, Locale.ENGLISH, new File("").getAbsoluteFile(), false);
+        this(project, Locale.ROOT, new File("").getAbsoluteFile(), false);
     }
 
     /**
@@ -135,7 +135,8 @@ public class PluginXdocGenerator implements Generator {
      * @throws IOException if any
      */
     protected void processMojoDescriptor(MojoDescriptor mojoDescriptor, File destinationDirectory) throws IOException {
-        File outputFile = new File(destinationDirectory, getMojoFilename(mojoDescriptor, "xml"));
+        // TODO Rewrite to: Sink sink = new XdocSinkFactory().createSink(outputDir, "*-mojo.xml", encoding);
+        File outputFile = new File(destinationDirectory, mojoDescriptor.getGoal() + "-mojo.xml");
         try (Writer writer = new OutputStreamWriter(new CachingOutputStream(outputFile), UTF_8)) {
             XMLWriter w = new PrettyPrintXMLWriter(new PrintWriter(writer), UTF_8.name(), null);
             writeBody(mojoDescriptor, w);
@@ -144,15 +145,6 @@ public class PluginXdocGenerator implements Generator {
         }
     }
 
-    /**
-     * @param mojo not null
-     * @param ext  not null
-     * @return the output file name
-     */
-    private String getMojoFilename(MojoDescriptor mojo, String ext) {
-        return mojo.getGoal() + "-mojo." + ext;
-    }
-
     /**
      * @param mojoDescriptor not null
      * @param w              not null
@@ -623,7 +615,6 @@ public class PluginXdocGenerator implements Generator {
         w.addAttribute("name", title);
 
         w.startElement("table");
-        w.addAttribute("border", "0");
         w.addAttribute("class", "bodyTable");
 
         w.startElement("tr");
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
index d7a54967..8bab3c46 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
@@ -43,7 +43,7 @@ pluginxdoc.mojodescriptor.parameter.details=Parameter Details
 pluginxdoc.mojodescriptor.parameter.deprecated=<strong>Deprecated.</strong> {0}
 pluginxdoc.mojodescriptor.parameter.name=Name
 pluginxdoc.mojodescriptor.parameter.name_link=<code><a href="#{0}">&lt;{0}&gt;</a></code>
-pluginxdoc.mojodescriptor.parameter.name_internal=<strong><a name="{0}">&lt;{0}&gt;</a></strong>
+pluginxdoc.mojodescriptor.parameter.name_internal=<strong><a id="{0}">&lt;{0}&gt;</a></strong>
 pluginxdoc.mojodescriptor.parameter.description=Description
 pluginxdoc.mojodescriptor.parameter.type=Type
 pluginxdoc.mojodescriptor.parameter.type_link=<a href="{1}">{0}</a>
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 25c6c70b..519d6604 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/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 09bf7ee2..4ece97e7 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-java</artifactId>
diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml
index 8882ace9..29981602 100644
--- a/maven-script/maven-plugin-tools-ant/pom.xml
+++ b/maven-script/maven-plugin-tools-ant/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-script</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-ant</artifactId>
diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml
index aec26796..92a1e73a 100644
--- a/maven-script/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-script/maven-plugin-tools-beanshell/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-script</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-beanshell</artifactId>
diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml
index 9c207b43..6f2663e2 100644
--- a/maven-script/maven-plugin-tools-model/pom.xml
+++ b/maven-script/maven-plugin-tools-model/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-script</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-tools-model</artifactId>
diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
index 26ce4d8b..ad42f5d3 100644
--- a/maven-script/maven-script-ant/pom.xml
+++ b/maven-script/maven-script-ant/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-script</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script-ant</artifactId>
diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml
index 8054d080..a42f7530 100644
--- a/maven-script/maven-script-beanshell/pom.xml
+++ b/maven-script/maven-script-beanshell/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-script</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script-beanshell</artifactId>
diff --git a/maven-script/pom.xml b/maven-script/pom.xml
index 03d23354..a5df5aac 100644
--- a/maven-script/pom.xml
+++ b/maven-script/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>3.9.1-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-script</artifactId>
diff --git a/pom.xml b/pom.xml
index b72ce50e..481902a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.maven.plugin-tools</groupId>
   <artifactId>maven-plugin-tools</artifactId>
-  <version>3.9.1-SNAPSHOT</version>
+  <version>3.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Plugin Tools</name>
@@ -102,8 +102,8 @@
     needs to be updated as well -->
     <asmVersion>9.5</asmVersion>
     <plexusUtilsVersion>3.5.1</plexusUtilsVersion>
-    <reportingApiVersion>3.1.1</reportingApiVersion>
-    <reportingImplVersion>3.2.0</reportingImplVersion>
+    <reportingApiVersion>4.0.0-M6</reportingApiVersion>
+    <reportingImplVersion>4.0.0-M8</reportingImplVersion>
     <compilerPluginVersion>3.11.0</compilerPluginVersion>
     <javadocPluginVersion>3.5.0</javadocPluginVersion>
     <project.build.outputTimestamp>2023-05-12T21:16:13Z</project.build.outputTimestamp>
@@ -192,12 +192,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>
@@ -224,24 +218,20 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-velocity</artifactId>
-        <version>1.2</version>
+        <version>2.0</version>
         <exclusions>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-          </exclusion>
         </exclusions>
       </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>