You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/01/16 00:56:03 UTC
[maven-integration-testing] branch master updated: document addition resolution groups, fix javadoc, upgrade parent
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new eac6b15 document addition resolution groups, fix javadoc, upgrade parent
eac6b15 is described below
commit eac6b15d25970223c5c25b5c4a342eb8c667a7d0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jan 16 01:56:01 2022 +0100
document addition resolution groups, fix javadoc, upgrade parent
---
core-it-suite/src/site/apt/bootstrap.apt.vm | 24 ++++++++++++++++++++++
core-it-suite/src/test/resources/bootstrap/pom.xml | 5 +++++
.../maven/plugin/coreit/CheckThreadSafetyMojo.java | 3 +--
.../apache/maven/plugin/coreit/ResolveMojo.java | 3 +--
.../org/apache/maven/plugin/coreit/EvalMojo.java | 4 ++--
.../org/apache/maven/plugin/coreit/ItMojo.java | 3 +--
.../maven/plugin/coreit/BuildLocalPomMojo.java | 3 +--
.../maven/plugin/coreit/BuildRemotePomMojo.java | 3 +--
pom.xml | 15 +++++++++++++-
9 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/core-it-suite/src/site/apt/bootstrap.apt.vm b/core-it-suite/src/site/apt/bootstrap.apt.vm
index ab66a08..2d159d6 100644
--- a/core-it-suite/src/site/apt/bootstrap.apt.vm
+++ b/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/core-it-suite/src/test/resources/bootstrap/pom.xml b/core-it-suite/src/test/resources/bootstrap/pom.xml
index fbae028..f3fdcbc 100644
--- a/core-it-suite/src/test/resources/bootstrap/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/pom.xml
@@ -106,6 +106,11 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-wrapper-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<configuration>
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
index 972456e..f9851c4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java
+++ b/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/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
index 29091ef..30ce809 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
+++ b/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/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
index db26472..6198b78 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
+++ b/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:
- * <p/>
+ *
* <pre>
* 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
* </pre>
- * <p/>
+ *
* Expressions that reference non-existing objects or use invalid collection/array indices silently resolve to
* <code>null</code>. For collections and arrays, the special index "*" can be used to iterate all elements.
*
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index 43600b3..0b0e532 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/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/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java
index cf078b9..7f3ee92 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildLocalPomMojo.java
+++ b/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/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
index 78f2237..d2a455e 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
+++ b/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/pom.xml b/pom.xml
index 49ecbb8..f071f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -144,6 +144,19 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-javadoc</artifactId>
+ <version>3.5.2</version>
+ </tagletArtifact>
+ </tagletArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<configuration>