[maven] branch master updated: Fix site generation (#828)

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b6977a85 Fix site generation (#828)
2b6977a85 is described below

commit 2b6977a85ff9d4e299f27645cde0440a5f09b650
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Oct 14 21:52:26 2022 +0200

    Fix site generation (#828)
---
 .github/workflows/maven_build_itself.yml                     |  2 +-
 .../src/main/java/org/apache/maven/api/Dependency.java       |  5 ++---
 .../src/main/java/org/apache/maven/api/Listener.java         |  2 +-
 api/maven-api-settings/src/main/mdo/settings.mdo             |  4 ++--
 .../maven/plugin/PluginParameterExpressionEvaluatorV4.java   |  6 +++---
 .../maven/model/inheritance/DefaultInheritanceAssembler.java |  2 +-
 maven-model/src/main/mdo/writer-ex.vm                        | 12 ++++++------
 maven-model/src/main/mdo/writer.vm                           | 12 ++++++------
 maven-plugin-api/pom.xml                                     |  5 -----
 maven-plugin-api/src/main/mdo/writer.vm                      |  8 ++++----
 .../maven/artifact/repository/metadata/MetadataTest.java     |  4 ++--
 maven-settings/src/main/mdo/writer.vm                        | 12 ++++++------
 maven-toolchain-model/src/main/mdo/writer.vm                 | 12 ++++++------
 13 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/maven_build_itself.yml 
b/.github/workflows/maven_build_itself.yml
index c181d23d1..5f60f0d53 100644
--- a/.github/workflows/maven_build_itself.yml
+++ b/.github/workflows/maven_build_itself.yml
@@ -70,4 +70,4 @@ jobs:
         run: |
           set +e
           export PATH=${{ env.TEMP_MAVEN_BIN_DIR }}:$PATH
-          mvn verify -e -B -V -DdistributionFileName=apache-maven
+          mvn verify site -e -B -V -DdistributionFileName=apache-maven 
-Preporting
diff --git 
a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java 
b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
index 51fa632ef..c3844398c 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
@@ -37,10 +37,9 @@ public interface Dependency extends Artifact
     boolean isOptional();
 
     /**
-     * Shortcut for {@code session.createDependencyCoordinate(dependency)}
+     * Creates a {@code DependencyCoordinate} based on this {@code Dependency}.
      *
-     * @return an {@link DependencyCoordinate}
-     * @see org.apache.maven.api.Session#createDependencyCoordinate(Dependency)
+     * @return a {@link DependencyCoordinate}
      */
     @Nonnull
     DependencyCoordinate toCoordinate();
diff --git 
a/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java 
b/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
index f6657da4d..673b5f8ed 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
@@ -25,7 +25,7 @@ import org.apache.maven.api.annotations.Nonnull;
 
 /**
  * A listener for session events.
- * TODO: open this to other events like {@link 
org.apache.maven.eventspy.EventSpy}
+ * TODO: open this to other events like similar to {@code 
org.apache.maven.eventspy.EventSpy}
  *
  * @since 4.0
  */
diff --git a/api/maven-api-settings/src/main/mdo/settings.mdo 
b/api/maven-api-settings/src/main/mdo/settings.mdo
index 6a5757bb8..a70d8886d 100644
--- a/api/maven-api-settings/src/main/mdo/settings.mdo
+++ b/api/maven-api-settings/src/main/mdo/settings.mdo
@@ -360,7 +360,7 @@
 
     /**
      * @return a Map of profiles field with <code>Profile#getId()</code> as key
-     * @see org.apache.maven.settings.Profile#getId()
+     * @see Profile#getId()
      */
     public java.util.Map<String, Profile> getProfilesAsMap()
     {
@@ -924,7 +924,7 @@
           <code>
             <![CDATA[
     /**
-     * @see org.apache.maven.settings.RepositoryBase#equals(java.lang.Object)
+     * @see RepositoryBase#equals(java.lang.Object)
      */
     public boolean equals( Object obj )
     {
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
index b0d1a865d..bd54fa086 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
@@ -47,15 +47,15 @@ import 
org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
  *                                             <td>{@link 
Session#getLocalRepository()}</td></tr>
  * <tr><td><code>reactorProjects</code></td>   <td></td>               
<td>{@link Session#getProjects()}</td></tr>
  * <tr><td><code>project</code></td>           <td></td>
- *                                             <td>{@link 
Session#getCurrentProject()}</td></tr>
+ *                                 <td>{@link 
org.apache.maven.execution.MavenSession#getCurrentProject()}</td></tr>
  * <tr><td><code>project.*</code></td>         <td></td>               
<td></td></tr>
  * <tr><td><code>pom.*</code></td>             <td>(since Maven 
3)</td><td>same as <code>project.*</code></td></tr>
  * <tr><td><code>executedProject</code></td>   <td></td>
- *                                             <td>{@link 
MavenProject#getExecutionProject()}</td></tr>
+ *                                 <td>{@link 
org.apache.maven.project.MavenProject#getExecutionProject()}</td></tr>
  * <tr><td><code>settings</code></td>          <td></td>               
<td>{@link Session#getSettings()}</td></tr>
  * <tr><td><code>settings.*</code></td>        <td></td>               
<td></td></tr>
  * <tr><td><code>basedir</code></td>           <td></td>
- *                                             <td>{@link 
Session#getExecutionRootDirectory()} or
+ *                                 <td>{@link 
Session#getExecutionRootDirectory()} or
  *                                                 <code>System.getProperty( 
"user.dir" )</code> if null</td></tr>
  * <tr><td><code>mojoExecution</code></td>     <td></td>               <td>the 
actual {@link MojoExecution}</td></tr>
  * <tr><td><code>mojo</code></td>              <td>(since Maven 
3)</td><td>same as <code>mojoExecution</code></td></tr>
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index 1002f29ff..0fb317da2 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -337,7 +337,7 @@ public class DefaultInheritanceAssembler
                     if ( element.isInherited() )
                     {
                         // NOTE: Enforce recursive merge to trigger 
merging/inheritance logic for executions as well
-                        ReportPlugin plugin = ReportPlugin.newInstance();
+                        ReportPlugin plugin = ReportPlugin.newInstance( false 
);
                         plugin = mergeReportPlugin( plugin, element, 
sourceDominant, context );
 
                         merged.put( getReportPluginKey().apply( element ), 
plugin );
diff --git a/maven-model/src/main/mdo/writer-ex.vm 
b/maven-model/src/main/mdo/writer-ex.vm
index f4c1dbdd2..1943287dd 100644
--- a/maven-model/src/main/mdo/writer-ex.vm
+++ b/maven-model/src/main/mdo/writer-ex.vm
@@ -114,9 +114,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param writer a writer object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param writer a writer object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( Writer writer, ${root.name} ${rootLcapName} )
         throws java.io.IOException
@@ -133,9 +133,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param stream a stream object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param stream a stream object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( OutputStream stream, ${root.name} ${rootLcapName} )
         throws java.io.IOException
diff --git a/maven-model/src/main/mdo/writer.vm 
b/maven-model/src/main/mdo/writer.vm
index c354d480f..75dfe0c58 100644
--- a/maven-model/src/main/mdo/writer.vm
+++ b/maven-model/src/main/mdo/writer.vm
@@ -96,9 +96,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param writer a writer object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param writer a writer object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( Writer writer, ${root.name} ${rootLcapName} )
         throws java.io.IOException
@@ -115,9 +115,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param stream a stream object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param stream a stream object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( OutputStream stream, ${root.name} ${rootLcapName} )
         throws java.io.IOException
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 828eaf49c..5b812942c 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -62,17 +62,12 @@ under the License.
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <version>2.0.0</version>
-        <!--
         <configuration>
           <models>
             <model>src/main/mdo/lifecycle.mdo</model>
           </models>
           <version>1.0.0</version>
-          <domAsCustom>true</domAsCustom>
-          
<domAsCustomInterface>org.apache.maven.api.xml.Dom</domAsCustomInterface>
-          
<domAsCustomBuilder>org.apache.maven.internal.xml.DomBuilder</domAsCustomBuilder>
         </configuration>
-        -->
         <executions>
           <execution>
             <id>modello</id>
diff --git a/maven-plugin-api/src/main/mdo/writer.vm 
b/maven-plugin-api/src/main/mdo/writer.vm
index e2740f45a..b1bc5edde 100644
--- a/maven-plugin-api/src/main/mdo/writer.vm
+++ b/maven-plugin-api/src/main/mdo/writer.vm
@@ -96,8 +96,8 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param writer a writer object.
-     * @param model a model object.
+     * @param writer a writer object
+     * @param ${rootLcapName} a ${root.name} object
      * @throws java.io.IOException java.io.IOException if any.
      */
     public void write( Writer writer, ${root.name} ${rootLcapName} )
@@ -115,8 +115,8 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param stream a stream object.
-     * @param model a model object.
+     * @param stream a stream object
+     * @param ${rootLcapName} a ${root.name} object
      * @throws java.io.IOException java.io.IOException if any.
      */
     public void write( OutputStream stream, ${root.name} ${rootLcapName} )
diff --git 
a/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
 
b/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
index ccdadbfcf..fe86e5d92 100644
--- 
a/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
+++ 
b/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
@@ -34,7 +34,7 @@ import org.eclipse.aether.artifact.DefaultArtifact;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class MetadataTest
+public class MetadataTest
 {
 
     Artifact artifact;
@@ -286,4 +286,4 @@ class MetadataTest
         versioning.setLastUpdatedTimestamp( timestamp );
     }
     /*-- END helper methods to populate metadata objects ---*/
-}
\ No newline at end of file
+}
diff --git a/maven-settings/src/main/mdo/writer.vm 
b/maven-settings/src/main/mdo/writer.vm
index c354d480f..75dfe0c58 100644
--- a/maven-settings/src/main/mdo/writer.vm
+++ b/maven-settings/src/main/mdo/writer.vm
@@ -96,9 +96,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param writer a writer object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param writer a writer object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( Writer writer, ${root.name} ${rootLcapName} )
         throws java.io.IOException
@@ -115,9 +115,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param stream a stream object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param stream a stream object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( OutputStream stream, ${root.name} ${rootLcapName} )
         throws java.io.IOException
diff --git a/maven-toolchain-model/src/main/mdo/writer.vm 
b/maven-toolchain-model/src/main/mdo/writer.vm
index c354d480f..75dfe0c58 100644
--- a/maven-toolchain-model/src/main/mdo/writer.vm
+++ b/maven-toolchain-model/src/main/mdo/writer.vm
@@ -96,9 +96,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param writer a writer object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param writer a writer object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( Writer writer, ${root.name} ${rootLcapName} )
         throws java.io.IOException
@@ -115,9 +115,9 @@ public class ${className}
     /**
      * Method write.
      *
-     * @param stream a stream object.
-     * @param model a model object.
-     * @throws java.io.IOException java.io.IOException if any.
+     * @param stream a stream object
+     * @param ${rootLcapName} a ${root.name} object
+     * @throws java.io.IOException java.io.IOException if any
      */
     public void write( OutputStream stream, ${root.name} ${rootLcapName} )
         throws java.io.IOException