Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix site generation (#828)

This commit is contained in:
Guillaume Nodet 2022-10-14 21:52:26 +02:00 committed by GitHub
parent c178b2fc1a
commit 2b6977a85f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/maven_build_itself.yml vendored
View File

@ -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

5
api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
View File

@ -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();

2
api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
View File

@ -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
*/

4
api/maven-api-settings/src/main/mdo/settings.mdo
View File

@ -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 )
{

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
View File

@ -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>

2
maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
View File

@ -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 );

12
maven-model/src/main/mdo/writer-ex.vm
View File

@ -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

12
maven-model/src/main/mdo/writer.vm
View File

@ -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

5
maven-plugin-api/pom.xml
View File

@ -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>

8
maven-plugin-api/src/main/mdo/writer.vm
View File

@ -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} )

4
maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
View File

@ -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 ---*/
}
}

12
maven-settings/src/main/mdo/writer.vm
View File

@ -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

12
maven-toolchain-model/src/main/mdo/writer.vm
View File

@ -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