From e4b2fc737f637641a158d0849c0930c1078bb5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 16 Jan 2022 01:56:01 +0100 Subject: [PATCH] document addition resolution groups, fix javadoc, upgrade parent --- .../src/site/apt/bootstrap.apt.vm | 24 +++++++++++++++++++ .../src/test/resources/bootstrap/pom.xml | 5 ++++ .../plugin/coreit/CheckThreadSafetyMojo.java | 3 +-- .../maven/plugin/coreit/ResolveMojo.java | 3 +-- .../apache/maven/plugin/coreit/EvalMojo.java | 4 ++-- .../apache/maven/plugin/coreit/ItMojo.java | 3 +-- .../plugin/coreit/BuildLocalPomMojo.java | 3 +-- .../plugin/coreit/BuildRemotePomMojo.java | 3 +-- its/pom.xml | 15 +++++++++++- 9 files changed, 50 insertions(+), 13 deletions(-) diff --git a/its/core-it-suite/src/site/apt/bootstrap.apt.vm b/its/core-it-suite/src/site/apt/bootstrap.apt.vm index ab66a08eb1..2d159d6183 100644 --- a/its/core-it-suite/src/site/apt/bootstrap.apt.vm +++ b/its/core-it-suite/src/site/apt/bootstrap.apt.vm @@ -64,3 +64,27 @@ Maven Core Integration Tests Bootstrap * Group 7 Dependencies %{snippet|file=${project.build.directory}/test-classes/bootstrap/group-7/target/resolve.txt} + +* Group 8 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-8/target/resolve.txt} + +* Group 9 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-9/target/resolve.txt} + +* Group 10 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-10/target/resolve.txt} + +* Group 11 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-11/target/resolve.txt} + +* Group 12 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-12/target/resolve.txt} + +* Group 13 Dependencies + +%{snippet|file=${project.build.directory}/test-classes/bootstrap/group-13/target/resolve.txt} diff --git a/its/core-it-suite/src/test/resources/bootstrap/pom.xml b/its/core-it-suite/src/test/resources/bootstrap/pom.xml index fbae028df7..f3fdcbc180 100644 --- a/its/core-it-suite/src/test/resources/bootstrap/pom.xml +++ b/its/core-it-suite/src/test/resources/bootstrap/pom.xml @@ -104,6 +104,11 @@ under the License. maven-assembly-plugin 3.1.0 + + org.apache.maven.plugins + maven-wrapper-plugin + 3.1.0 + org.apache.maven.plugins maven-dependency-plugin diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java index 972456ef60..f9851c42bf 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import java.io.File; import java.io.FileOutputStream; @@ -75,7 +74,7 @@ public class CheckThreadSafetyMojo /** * Runs this mojo. * - * @throws MojoFailureException If the output file could not be created. + * @throws MojoExecutionException If the output file could not be created. */ public void execute() throws MojoExecutionException diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java index 29091ef940..30ce809826 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java @@ -26,7 +26,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import java.io.File; import java.io.FileOutputStream; @@ -94,7 +93,7 @@ public class ResolveMojo /** * Runs this mojo. * - * @throws MojoFailureException If the artifact could not be resolved + * @throws MojoExecutionException If the artifact could not be resolved */ public void execute() throws MojoExecutionException diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java index db26472827..6198b78313 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java @@ -36,7 +36,7 @@ import java.util.Properties; * value but can also be a collection/array or a bean-like object (from the Maven model). For example, the expression * "project/dependencies/0" would extract the first project dependency. In more detail, this example expression could * output the following keys to the properties file: - *

+ * * 

  * project.dependencies.0.groupId = org.apache.maven
  * project.dependencies.0.artifactId = maven-project
@@ -49,7 +49,7 @@ import java.util.Properties;
  * project.dependencies.0.exclusions.1.groupId = plexus
  * project.dependencies.0.exclusions.1.artifactId = plexus-container-default
  *
- *

+ * * Expressions that reference non-existing objects or use invalid collection/array indices silently resolve to * null. For collections and arrays, the special index "*" can be used to iterate all elements. * diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java index 43600b3779..0b0e532ada 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java @@ -29,7 +29,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; /** * Resolves an artifact and has an (unused) dependency on log4j. @@ -86,7 +85,7 @@ public class ItMojo * Runs this mojo. * * @throws MojoExecutionException If the output file could not be created. - * @throws MojoFailureException If the output file has not been set. + * or if the output file has not been set. */ public void execute() throws MojoExecutionException diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java index cf078b9954..7f3ee92ed3 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import java.io.File; @@ -63,7 +62,7 @@ public class BuildLocalPomMojo /** * Runs this mojo. * - * @throws MojoFailureException If the artifact file has not been set. + * @throws MojoExecutionException If the artifact file has not been set. */ public void execute() throws MojoExecutionException diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java index 78f22377c7..d2a455e8b1 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java @@ -24,7 +24,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Dependency; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import java.io.File; @@ -84,7 +83,7 @@ public class BuildRemotePomMojo /** * Runs this mojo. * - * @throws MojoFailureException If the artifact file has not been set. + * @throws MojoExecutionException If the artifact file has not been set. */ public void execute() throws MojoExecutionException diff --git a/its/pom.xml b/its/pom.xml index 49ecbb8658..f071f7036c 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent - 33 + 34 ../pom/maven/pom.xml @@ -142,6 +142,19 @@ under the License. + + org.apache.maven.plugins + maven-javadoc-plugin + + + + org.apache.maven.plugin-tools + maven-plugin-tools-javadoc + 3.5.2 + + + + org.apache.maven.plugins maven-scm-publish-plugin