You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/09 17:31:33 UTC
(maven-integration-testing) branch maven-3.10.x updated (b1adb6b6c -> 98b4d2dd0)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
from b1adb6b6c Verify that the debug level of extensions is respected
new d0228d444 Migrate legacy plugin Javadoc annotations
new 98b4d2dd0 Mark injected parameters as read-only
The 2 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:
.../src/test/resources/mng-0612/plugin/pom.xml | 6 +++
.../apache/maven/its/it0125/DependenciesMojo.java | 14 +++--
.../src/test/resources/mng-0870/plugin/pom.xml | 6 +++
.../org/apache/maven/plugin/coreit/LoadMojo.java | 10 ++--
.../src/test/resources/mng-1088/plugin/pom.xml | 6 +++
.../org/apache/maven/plugin/coreit/TouchMojo.java | 9 ++--
.../src/test/resources/mng-2135/plugin/pom.xml | 6 +++
.../plugin/src/main/java/coreit/ItMojo.java | 10 ++--
.../src/test/resources/mng-2771/plugin/pom.xml | 12 +++++
.../org/apache/maven/its/it0124/LookupMojo.java | 18 ++++---
.../mng-3372/direct-using-prefix/plugin/pom.xml | 6 +++
.../plugin/src/main/java/org/plugin/TestMojo.java | 11 ++--
.../test/resources/mng-3396/plugin/plugin/pom.xml | 6 +++
.../org/apache/maven/its/mng3396/NoopMojo.java | 9 ++--
.../mng-3498/maven-mng3498-plugin/pom.xml | 6 +++
.../src/main/java/plugin/CheckMojo.java | 15 +++---
.../src/main/java/plugin/TouchMojo.java | 8 +--
.../src/test/resources/mng-3536/plugin/pom.xml | 6 +++
.../plugin/src/main/java/plugin/Mojo3563.java | 17 +++---
.../src/test/resources/mng-3536/project/pom.xml | 8 +++
.../project/src/main/java/plugin/Mojo3563.java | 11 ++--
.../test/resources/mng-3652/test-plugin/pom.xml | 12 +++++
.../java/org/apache/maven/its/mng3652/MyMojo.java | 63 +++++++++-------------
.../mng-3684/maven-mng3684-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 18 ++-----
.../src/main/java/plugin/MyReport.java | 18 ++-----
.../mng-3693/maven-mng3693-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 13 ++---
.../mng-3694/maven-mng3694-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 17 +++---
.../mng-3703/maven-mng3703-plugin/pom.xml | 6 +++
.../src/main/java/jar/AbstractCheckMojo.java | 13 ++---
.../src/main/java/jar/CheckMojo.java | 9 ++--
.../src/main/java/jar/CheckReport.java | 27 ++++------
.../src/main/java/jar/RunMojo.java | 7 ++-
.../maven-mng3710-directInvoke-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 5 +-
.../maven-mng3710-originalModel-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 12 ++---
.../maven-mng3710-pomInheritance-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../mng-3716/maven-mng3716-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 10 ++--
.../mng-3723/maven-mng3723-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 10 ++--
.../mng-3724/maven-mng3724-plugin/pom.xml | 6 +++
.../src/main/java/jar/AbstractMng2734Mojo.java | 4 +-
.../src/main/java/jar/Phase1ForkingMojo.java | 9 ++--
.../src/main/java/jar/Phase2GeneratorMojo.java | 12 ++---
.../src/main/java/jar/Phase3ForkVerifierMojo.java | 15 +++---
.../mng-3729/maven-mng3729-plugin/pom.xml | 6 +++
.../src/main/java/jar/Fork1Mojo.java | 10 ++--
.../src/main/java/jar/Fork2Mojo.java | 10 ++--
.../src/main/java/jar/Plain1Mojo.java | 7 ++-
.../projects.v1/maven-mng3740-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../projects.v2/maven-mng3740-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../mng-3746/maven-mng3746-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 24 +++------
.../plugin/pom.xml | 6 +++
.../apache/maven/its/mng6127/plugin/TestMojo.java | 14 +++--
.../plugin-extension/pom.xml | 6 +++
.../java/org/apache/maven/its/plugin/TestMojo.java | 5 +-
.../org/apache/maven/plugin/coreit/CoreItMojo.java | 7 +--
.../plugin/coreit/PropertyInterpolationMojo.java | 7 +--
.../org/apache/maven/plugin/coreit/InfoReport.java | 4 +-
67 files changed, 383 insertions(+), 308 deletions(-)
(maven-integration-testing) 01/02: Migrate legacy plugin Javadoc annotations
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit d0228d44476b77dbfc91f948dad3d6cfc8207dec
Author: Vaclav Haisman <vh...@gmail.com>
AuthorDate: Sat Aug 8 14:22:20 2026 +0200
Migrate legacy plugin Javadoc annotations
Replace legacy doclet tags in Maven Core integration-test plugin fixtures with maven-plugin-annotations metadata. Add the required provided dependencies and use constructor injection for migrated components.
---
.../src/test/resources/mng-0612/plugin/pom.xml | 6 +++
.../apache/maven/its/it0125/DependenciesMojo.java | 14 +++--
.../src/test/resources/mng-0870/plugin/pom.xml | 6 +++
.../org/apache/maven/plugin/coreit/LoadMojo.java | 10 ++--
.../src/test/resources/mng-1088/plugin/pom.xml | 6 +++
.../org/apache/maven/plugin/coreit/TouchMojo.java | 9 ++--
.../src/test/resources/mng-2135/plugin/pom.xml | 6 +++
.../plugin/src/main/java/coreit/ItMojo.java | 10 ++--
.../src/test/resources/mng-2771/plugin/pom.xml | 12 +++++
.../org/apache/maven/its/it0124/LookupMojo.java | 18 ++++---
.../mng-3372/direct-using-prefix/plugin/pom.xml | 6 +++
.../plugin/src/main/java/org/plugin/TestMojo.java | 11 ++--
.../test/resources/mng-3396/plugin/plugin/pom.xml | 6 +++
.../org/apache/maven/its/mng3396/NoopMojo.java | 9 ++--
.../mng-3498/maven-mng3498-plugin/pom.xml | 6 +++
.../src/main/java/plugin/CheckMojo.java | 15 +++---
.../src/main/java/plugin/TouchMojo.java | 8 +--
.../src/test/resources/mng-3536/plugin/pom.xml | 6 +++
.../plugin/src/main/java/plugin/Mojo3563.java | 17 +++---
.../src/test/resources/mng-3536/project/pom.xml | 8 +++
.../project/src/main/java/plugin/Mojo3563.java | 11 ++--
.../test/resources/mng-3652/test-plugin/pom.xml | 12 +++++
.../java/org/apache/maven/its/mng3652/MyMojo.java | 63 +++++++++-------------
.../mng-3684/maven-mng3684-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 18 ++-----
.../src/main/java/plugin/MyReport.java | 18 ++-----
.../mng-3693/maven-mng3693-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 13 ++---
.../mng-3694/maven-mng3694-plugin/pom.xml | 6 +++
.../src/main/java/plugin/MyMojo.java | 17 +++---
.../mng-3703/maven-mng3703-plugin/pom.xml | 6 +++
.../src/main/java/jar/AbstractCheckMojo.java | 13 ++---
.../src/main/java/jar/CheckMojo.java | 9 ++--
.../src/main/java/jar/CheckReport.java | 27 ++++------
.../src/main/java/jar/RunMojo.java | 7 ++-
.../maven-mng3710-directInvoke-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 5 +-
.../maven-mng3710-originalModel-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 12 ++---
.../maven-mng3710-pomInheritance-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../mng-3716/maven-mng3716-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 10 ++--
.../mng-3723/maven-mng3723-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 10 ++--
.../mng-3724/maven-mng3724-plugin/pom.xml | 6 +++
.../src/main/java/jar/AbstractMng2734Mojo.java | 4 +-
.../src/main/java/jar/Phase1ForkingMojo.java | 9 ++--
.../src/main/java/jar/Phase2GeneratorMojo.java | 12 ++---
.../src/main/java/jar/Phase3ForkVerifierMojo.java | 15 +++---
.../mng-3729/maven-mng3729-plugin/pom.xml | 6 +++
.../src/main/java/jar/Fork1Mojo.java | 10 ++--
.../src/main/java/jar/Fork2Mojo.java | 10 ++--
.../src/main/java/jar/Plain1Mojo.java | 7 ++-
.../projects.v1/maven-mng3740-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../projects.v2/maven-mng3740-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 11 ++--
.../mng-3746/maven-mng3746-plugin/pom.xml | 6 +++
.../src/main/java/jar/MyMojo.java | 24 +++------
.../plugin/pom.xml | 6 +++
.../apache/maven/its/mng6127/plugin/TestMojo.java | 14 +++--
.../plugin-extension/pom.xml | 6 +++
.../java/org/apache/maven/its/plugin/TestMojo.java | 5 +-
.../org/apache/maven/plugin/coreit/CoreItMojo.java | 7 +--
.../plugin/coreit/PropertyInterpolationMojo.java | 7 +--
.../org/apache/maven/plugin/coreit/InfoReport.java | 4 +-
67 files changed, 383 insertions(+), 308 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml b/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
index 43e098795..1fd179bc5 100644
--- a/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
@@ -18,5 +18,11 @@
<artifactId>maven-artifact</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java b/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
index 1580dc218..f2180566b 100644
--- a/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
+++ b/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
@@ -48,23 +48,21 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Simple mojo to write the project's resolved dependencies to a file.
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @goal dependencies
- * @requiresDependencyResolution test
*/
+@Mojo(name = "dependencies", requiresDependencyResolution = ResolutionScope.TEST)
public class DependenciesMojo extends AbstractMojo {
- /**
- * @parameter expression="${project.artifacts}"
- */
+ @Parameter(defaultValue = "${project.artifacts}")
private Set artifacts;
- /**
- * @parameter expression="${project.build.directory}"
- */
+ @Parameter(defaultValue = "${project.build.directory}")
private String buildDirectory;
/*
diff --git a/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml b/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
index 2964f87d7..090044040 100644
--- a/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
@@ -54,6 +54,12 @@ under the License.
<artifactId>dep</artifactId>
<version>0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java b/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
index a0191f6ea..17c8b4402 100644
--- a/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
+++ b/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
@@ -44,23 +44,23 @@ import java.net.URL;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Creates a touch file if and only if a resource from the plugin dependency was successfully loaded, fails otherwise.
*
- * @goal load
- * @phase validate
*
* @author Benjamin Bentmann
- *
*/
+@Mojo(name = "load", defaultPhase = LifecyclePhase.VALIDATE)
public class LoadMojo extends AbstractMojo {
/**
* The path to the output file, relative to the project base directory.
- *
- * @parameter expression="${touch.file}" default-value="target/touch.txt"
*/
+ @Parameter(property = "touch.file", defaultValue = "target/touch.txt")
private File file;
/**
diff --git a/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml b/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
index 09687bc16..18aeb2e7d 100644
--- a/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
@@ -48,6 +48,12 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index a2ebf9359..6d98110a6 100644
--- a/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -42,22 +42,23 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Creates a text file.
*
- * @goal touch
- * @phase validate
*
* @author Benjamin Bentmann
*/
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.VALIDATE)
public class TouchMojo extends AbstractMojo {
/**
* The path to the output file, relative to the project base directory.
- *
- * @parameter expression="${touch.file}" default-value="target/touch.txt"
*/
+ @Parameter(property = "touch.file", defaultValue = "target/touch.txt")
private File file;
/**
diff --git a/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml b/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
index 8b1e1b4b7..6a979c40f 100644
--- a/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-2135/plugin/pom.xml
@@ -38,6 +38,12 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java b/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
index 07093cd0b..d3884bee6 100644
--- a/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
+++ b/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
@@ -40,15 +40,13 @@ package coreit;
import java.io.*;
import org.apache.maven.plugin.*;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
-/**
- * @goal it
- */
+@Mojo(name = "it")
public class ItMojo extends AbstractMojo {
- /**
- * @parameter default-value="${project.build.directory}/touch.txt"
- */
+ @Parameter(defaultValue = "${project.build.directory}/touch.txt")
private File outputFile;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml b/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
index 91061f0bb..999987c2b 100644
--- a/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
@@ -18,5 +18,17 @@
<artifactId>maven-artifact</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java b/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
index 68cdf7e65..2ed71bb9c 100644
--- a/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
+++ b/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
@@ -37,6 +37,8 @@ package org.apache.maven.its.it0124;
* under the License.
*/
+import javax.inject.Inject;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -46,22 +48,19 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Simple mojo to write the injected artifact factory implementation to a file.
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
- * @goal lookup
*/
+@Mojo(name = "lookup")
public class LookupMojo extends AbstractMojo {
- /**
- * @component
- */
private ArtifactFactory artifactFactory;
- /**
- * @parameter expression="${project.build.directory}"
- */
+ @Parameter(defaultValue = "${project.build.directory}")
private String buildDirectory;
/*
@@ -85,4 +84,9 @@ public class LookupMojo extends AbstractMojo {
throw new MojoExecutionException("Cannot create lookup.log", exception);
}
}
+
+ @Inject
+ public LookupMojo(ArtifactFactory artifactFactory) {
+ this.artifactFactory = artifactFactory;
+ }
}
diff --git a/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/pom.xml
index be88702be..abed9086e 100644
--- a/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/pom.xml
@@ -12,5 +12,11 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/src/main/java/org/plugin/TestMojo.java b/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/src/main/java/org/plugin/TestMojo.java
index 8b2326f30..5bff10eef 100644
--- a/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/src/main/java/org/plugin/TestMojo.java
+++ b/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/src/main/java/org/plugin/TestMojo.java
@@ -26,19 +26,14 @@ import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Parameter;
-/**
- * @goal test
- */
+@org.apache.maven.plugins.annotations.Mojo(name = "test")
public class TestMojo implements Mojo {
private Log log;
- /**
- * @parameter default-value="${project.build.directory}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build.directory}", required = true, readonly = true)
private File buildDir;
public void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
index ae3e8eab9..9e5b4c764 100644
--- a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/pom.xml
@@ -31,6 +31,12 @@
<artifactId>B</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
index 5e9792774..729e02369 100644
--- a/core-it-suite/src/test/resources/mng-3396/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
+++ b/core-it-suite/src/test/resources/mng-3396/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
@@ -35,12 +35,11 @@ package org.apache.maven.its.mng3396;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
-/**
- * @goal noop
- * @phase compile
- * @requiresDependencyResolution test
- */
+@Mojo(name = "noop", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution = ResolutionScope.TEST)
public class NoopMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {}
diff --git a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
index b3c05947e..b5802eed7 100644
--- a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/pom.xml
@@ -31,6 +31,12 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/CheckMojo.java b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/CheckMojo.java
index ef719f740..283cb8ed2 100644
--- a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/CheckMojo.java
+++ b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/CheckMojo.java
@@ -24,18 +24,15 @@ import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Parameter;
-/**
- * @goal check
- * @phase validate
- * @execute goal="touch"
- */
+@Execute(goal = "touch")
+@org.apache.maven.plugins.annotations.Mojo(name = "check", defaultPhase = LifecyclePhase.VALIDATE)
public class CheckMojo implements Mojo {
- /**
- * @parameter default-value="${project.build.directory}/touch.txt"
- * @required
- */
+ @Parameter(defaultValue = "${project.build.directory}/touch.txt", required = true)
private File touchFile;
private Log log;
diff --git a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/TouchMojo.java b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/TouchMojo.java
index 331e2313c..3f48bd857 100644
--- a/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/TouchMojo.java
+++ b/core-it-suite/src/test/resources/mng-3498/maven-mng3498-plugin/src/main/java/plugin/TouchMojo.java
@@ -40,18 +40,18 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Goal which touches a timestamp file.
- *
- * @goal touch
*/
+@Mojo(name = "touch")
public class TouchMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}", required = true)
private File outputDirectory;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
index 08ebd54af..87d42f071 100644
--- a/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3536/plugin/pom.xml
@@ -35,6 +35,12 @@ under the License.
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java b/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
index aae4e0f56..e8a0aec3d 100644
--- a/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
+++ b/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
@@ -28,24 +28,19 @@ import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.IOUtil;
-/**
- * @goal validate
- * @phase validate
- */
+@Mojo(name = "validate", defaultPhase = LifecyclePhase.VALIDATE)
public class Mojo3563 extends AbstractMojo {
- /**
- * @parameter default-value="${project}"
- */
+ @Parameter(defaultValue = "${project}")
private MavenProject project;
- /**
- * @parameter
- * @required
- */
+ @Parameter(required = true)
private File foo;
public void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/core-it-suite/src/test/resources/mng-3536/project/pom.xml b/core-it-suite/src/test/resources/mng-3536/project/pom.xml
index 78aa3b1b9..d003b6807 100644
--- a/core-it-suite/src/test/resources/mng-3536/project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3536/project/pom.xml
@@ -27,6 +27,14 @@ under the License.
<properties>
<test>file:${project.build.sourceDirectory}/plugin/Mojo3563.java</test>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
diff --git a/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java b/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
index 786912a87..fea418d46 100644
--- a/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
+++ b/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
@@ -24,19 +24,18 @@ import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
/**
* Maven Mojo for executing nunit tests
- *
- * @goal validate
- * @phase validate
*/
+@Mojo(name = "validate", defaultPhase = LifecyclePhase.VALIDATE)
public class Mojo3563 extends AbstractMojo {
- /**
- * @parameter expression="${project}"
- */
+ @Parameter(defaultValue = "${project}")
private MavenProject project;
public void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
index 19d133d59..fafd36589 100644
--- a/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3652/test-plugin/pom.xml
@@ -31,6 +31,18 @@
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java b/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
index 6b7619bd5..fd49cbd74 100644
--- a/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
@@ -18,6 +18,8 @@
*/
package org.apache.maven.its.mng3652;
+import javax.inject.Inject;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -35,6 +37,9 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -43,62 +48,28 @@ import org.codehaus.plexus.util.IOUtil;
* at the specified port. This is used to allow the unit test class to record the
* User-Agent HTTP header in use. It will also write the maven version in use to
* a file in the output directory, for comparison in the unit tests assertions.
- *
- * @goal touch
- *
- * @phase validate
*/
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.VALIDATE)
public class MyMojo extends AbstractMojo {
private static final String LS = System.getProperty("line.separator");
- /**
- * @parameter default-value="${project.build.directory}/touch.txt"
- */
+ @Parameter(defaultValue = "${project.build.directory}/touch.txt")
private File touchFile;
- /**
- * @component
- */
private ArtifactResolver resolver;
-
- /**
- * @component
- */
private ArtifactFactory artifactFactory;
-
- /**
- * @component
- */
private ArtifactRepositoryFactory repositoryFactory;
-
- /**
- * @component
- */
private ArtifactRepositoryLayout layout;
-
- /**
- * @component
- */
private RuntimeInformation runtimeInformation;
- /**
- * @parameter expression="${testProtocol}" default-value="http"
- * @required
- */
+ @Parameter(property = "testProtocol", defaultValue = "http", required = true)
private String testProtocol;
- /**
- * @parameter expression="${testPort}"
- * @required
- */
+ @Parameter(property = "testPort", required = true)
private String testPort;
- /**
- * @parameter default-value="${project.build.directory}/local-repo"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build.directory}/local-repo", required = true, readonly = true)
private File localRepoDir;
public void execute() throws MojoExecutionException {
@@ -180,4 +151,18 @@ public class MyMojo extends AbstractMojo {
IOUtil.close(w);
}
}
+
+ @Inject
+ public MyMojo(
+ ArtifactResolver resolver,
+ ArtifactFactory artifactFactory,
+ ArtifactRepositoryFactory repositoryFactory,
+ ArtifactRepositoryLayout layout,
+ RuntimeInformation runtimeInformation) {
+ this.resolver = resolver;
+ this.artifactFactory = artifactFactory;
+ this.repositoryFactory = repositoryFactory;
+ this.layout = layout;
+ this.runtimeInformation = runtimeInformation;
+ }
}
diff --git a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
index 9d5644321..d6613b78c 100644
--- a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/pom.xml
@@ -28,6 +28,12 @@
<artifactId>maven-reporting-impl</artifactId>
<version>2.0.4.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
index 75c7e910b..26faca217 100644
--- a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
@@ -43,24 +43,16 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal check
- */
+@Mojo(name = "check")
public class MyMojo extends AbstractMojo {
- /**
- * @parameter default-value="${project.build}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build}", required = true, readonly = true)
private Build build;
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
index e92803e76..b58640b77 100644
--- a/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
+++ b/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
@@ -43,26 +43,18 @@ import java.util.Map;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.Build;
import org.apache.maven.model.Resource;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-/**
- * @goal check-report
- */
+@Mojo(name = "check-report")
public class MyReport extends AbstractMavenReport {
- /**
- * @parameter default-value="${project.build}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build}", required = true, readonly = true)
private Build build;
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
private void runChecks() throws MavenReportException {
diff --git a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
index cbfe9f90d..7c5bc468a 100644
--- a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/pom.xml
@@ -18,6 +18,12 @@
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
index c5ce0c9cb..1b333f1ef 100644
--- a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
@@ -39,18 +39,15 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-/**
- * @goal move-pom
- * @phase package
- */
+@Mojo(name = "move-pom", defaultPhase = LifecyclePhase.PACKAGE)
public class MyMojo extends AbstractMojo {
- /**
- * @parameter expression="${project}"
- * @required
- */
+ @Parameter(defaultValue = "${project}", required = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
index 453d92ab0..9ab84e3a2 100644
--- a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/pom.xml
@@ -18,6 +18,12 @@
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
index 3f4e3c526..b84a80355 100644
--- a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
@@ -39,30 +39,27 @@ import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal check
- * @phase validate
- */
+@Mojo(name = "check", defaultPhase = LifecyclePhase.VALIDATE)
public class MyMojo extends AbstractMojo {
/**
* Not used, just an offset to place reactorProjects in the middle.
- * @parameter default-value="${project.build.directory}"
*/
+ @Parameter(defaultValue = "${project.build.directory}")
private String outputDirectory;
- /**
- * @parameter expression="${reactorProjects}"
- * @required
- */
+ @Parameter(defaultValue = "${reactorProjects}", required = true)
private List reactorProjects;
/**
* Not used, just an offset to place reactorProjects in the middle.
- * @parameter default-value="${project.build.directory}"
*/
+ @Parameter(defaultValue = "${project.build.directory}")
private String outputDirectory2;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
index 122131359..c39643000 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/pom.xml
@@ -23,6 +23,12 @@
<artifactId>maven-reporting-impl</artifactId>
<version>2.0.4.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
index 48786416c..21ba9ff70 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
@@ -41,24 +41,17 @@ import java.util.Map;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
public abstract class AbstractCheckMojo extends AbstractMojo {
protected static boolean forkHasRun = false;
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
- /**
- * @parameter default-value="${executedProject}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${executedProject}", required = true, readonly = true)
private MavenProject executionProject;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
index 758081834..ec6f367db 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
@@ -34,12 +34,13 @@ package jar;
* limitations under the License.
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.project.MavenProject;
-/**
- * @goal check
- * @execute phase="compile"
- */
+@Execute(phase = LifecyclePhase.COMPILE)
+@Mojo(name = "check")
public class CheckMojo extends AbstractCheckMojo {
protected MavenProject getTestProject() {
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckReport.java b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckReport.java
index 21b213ee1..9961d6bff 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckReport.java
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckReport.java
@@ -42,34 +42,25 @@ import java.util.Map;
import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-/**
- * @goal check-report
- * @execute phase="compile"
- */
+@Execute(phase = LifecyclePhase.COMPILE)
+@Mojo(name = "check-report")
public class CheckReport extends AbstractMavenReport {
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
- /**
- * @parameter default-value="${executedProject}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${executedProject}", required = true, readonly = true)
private MavenProject executionProject;
- /**
- * @parameter default-value="${project.build.directory}/generated-site/mng3703"
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build.directory}/generated-site/mng3703", readonly = true)
private String outputDirectory;
protected void executeReport(Locale locale) throws MavenReportException {
diff --git a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
index 8a4748338..240bec465 100644
--- a/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
+++ b/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
@@ -35,12 +35,11 @@ package jar;
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.project.MavenProject;
-/**
- * @goal run
- * @phase validate
- */
+@Mojo(name = "run", defaultPhase = LifecyclePhase.VALIDATE)
public class RunMojo extends AbstractCheckMojo {
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
index 3036dccba..7af90d5b6 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/pom.xml
@@ -12,6 +12,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/src/main/java/jar/MyMojo.java
index 9007fc3e6..8ef93ce75 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-directInvoke-plugin/src/main/java/jar/MyMojo.java
@@ -36,10 +36,9 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal run
- */
+@Mojo(name = "run")
public class MyMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {
getLog().info("Direct-invoke mojo executed.");
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
index 9c21fd159..78bc947b2 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/pom.xml
@@ -17,6 +17,12 @@
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/src/main/java/jar/MyMojo.java
index 9beecec0f..6d1414cc7 100644
--- a/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3710/original-model/plugins/maven-mng3710-originalModel-plugin/src/main/java/jar/MyMojo.java
@@ -41,17 +41,13 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal check
- */
+@Mojo(name = "check")
public class MyMojo extends AbstractMojo {
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
index 1daf15371..7f46b77b6 100644
--- a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/pom.xml
@@ -12,6 +12,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/src/main/java/jar/MyMojo.java
index 03c346a28..843c4e20d 100644
--- a/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3710/pom-inheritance/maven-mng3710-pomInheritance-plugin/src/main/java/jar/MyMojo.java
@@ -40,20 +40,19 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Goal which touches a timestamp file.
- *
- * @goal touch
- *
- * @phase process-sources
*/
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
public class MyMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}/touch.txt"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}/touch.txt", required = true)
private File touchFile;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
index ecb77fc73..55d79bd95 100644
--- a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/pom.xml
@@ -13,6 +13,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/src/main/java/jar/MyMojo.java
index 7d6afc4ee..22dddf988 100644
--- a/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3716/maven-mng3716-plugin/src/main/java/jar/MyMojo.java
@@ -36,12 +36,12 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal run
- * @aggregator
- * @execute phase="package"
- */
+@Execute(phase = LifecyclePhase.PACKAGE)
+@Mojo(name = "run", aggregator = true)
public class MyMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {
getLog().info("Aggregator mojo executed.");
diff --git a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
index 6e0f9e25d..f623db1f3 100644
--- a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/pom.xml
@@ -18,6 +18,12 @@
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/src/main/java/jar/MyMojo.java
index 28b84611d..b18278fa2 100644
--- a/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3723/maven-mng3723-plugin/src/main/java/jar/MyMojo.java
@@ -36,18 +36,16 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal run
- */
+@Mojo(name = "run")
public class MyMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project}"
- * @required
- * @readonly
*/
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
index 9a9b7e0f8..174ade598 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/pom.xml
@@ -18,6 +18,12 @@
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/AbstractMng2734Mojo.java b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/AbstractMng2734Mojo.java
index 72f41fa45..736201fa9 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/AbstractMng2734Mojo.java
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/AbstractMng2734Mojo.java
@@ -21,14 +21,14 @@ package jar;
import java.io.File;
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
public abstract class AbstractMng2734Mojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}/generated/src/main/java"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}/generated/src/main/java", required = true)
private File generatorTargetDir;
protected final File getGeneratorTargetDir() {
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase1ForkingMojo.java b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase1ForkingMojo.java
index ff8ddb8df..00083a384 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase1ForkingMojo.java
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase1ForkingMojo.java
@@ -36,11 +36,12 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal phase1
- * @execute phase="validate"
- */
+@Execute(phase = LifecyclePhase.VALIDATE)
+@Mojo(name = "phase1")
public class Phase1ForkingMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {}
}
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase2GeneratorMojo.java b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase2GeneratorMojo.java
index 9bb73b38b..c3d65fc4f 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase2GeneratorMojo.java
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase2GeneratorMojo.java
@@ -39,17 +39,13 @@ import java.io.FileWriter;
import java.io.IOException;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal phase2
- */
+@Mojo(name = "phase2")
public class Phase2GeneratorMojo extends AbstractMng2734Mojo {
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase3ForkVerifierMojo.java b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase3ForkVerifierMojo.java
index 9569d6c63..6d2995ce1 100644
--- a/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase3ForkVerifierMojo.java
+++ b/core-it-suite/src/test/resources/mng-3724/maven-mng3724-plugin/src/main/java/jar/Phase3ForkVerifierMojo.java
@@ -38,17 +38,16 @@ import java.util.Iterator;
import java.util.List;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- * @goal phase3
- * @execute phase="validate"
- */
+@Execute(phase = LifecyclePhase.VALIDATE)
+@Mojo(name = "phase3")
public class Phase3ForkVerifierMojo extends AbstractMng2734Mojo {
- /**
- * @parameter expression="${executedProject}"
- * @required
- */
+ @Parameter(defaultValue = "${executedProject}", required = true)
private MavenProject executedProject;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
index 6732382bb..b7a03c570 100644
--- a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/pom.xml
@@ -13,6 +13,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork1Mojo.java b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork1Mojo.java
index cd5aa965e..6592f3045 100644
--- a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork1Mojo.java
+++ b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork1Mojo.java
@@ -36,12 +36,12 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal fork1
- * @aggregator
- * @execute phase="compile"
- */
+@Execute(phase = LifecyclePhase.COMPILE)
+@Mojo(name = "fork1", aggregator = true)
public class Fork1Mojo extends AbstractMojo {
public void execute() throws MojoExecutionException {}
}
diff --git a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork2Mojo.java b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork2Mojo.java
index fbfdd2da4..5317eab16 100644
--- a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork2Mojo.java
+++ b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Fork2Mojo.java
@@ -36,12 +36,12 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal fork2
- * @aggregator
- * @execute phase="compile"
- */
+@Execute(phase = LifecyclePhase.COMPILE)
+@Mojo(name = "fork2", aggregator = true)
public class Fork2Mojo extends AbstractMojo {
public void execute() throws MojoExecutionException {}
}
diff --git a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Plain1Mojo.java b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Plain1Mojo.java
index d6329a2d8..392c167e9 100644
--- a/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Plain1Mojo.java
+++ b/core-it-suite/src/test/resources/mng-3729/maven-mng3729-plugin/src/main/java/jar/Plain1Mojo.java
@@ -36,11 +36,10 @@ package jar;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
-/**
- * @goal plain1
- * @requiresDependencyResolution compile
- */
+@Mojo(name = "plain1", requiresDependencyResolution = ResolutionScope.COMPILE)
public class Plain1Mojo extends AbstractMojo {
public void execute() throws MojoExecutionException {}
}
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
index e25382a61..5b9c7a548 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/pom.xml
@@ -17,6 +17,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
index 010f10c52..26c1f510c 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v1/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
@@ -40,20 +40,19 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Goal which touches a timestamp file.
- *
- * @goal touch
- *
- * @phase process-sources
*/
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
public class MyMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}", required = true)
private File outputDirectory;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
index 303f6dbbe..1e2aa9f2c 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/pom.xml
@@ -17,6 +17,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
index 010f10c52..26c1f510c 100644
--- a/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3740/projects.v2/maven-mng3740-plugin/src/main/java/jar/MyMojo.java
@@ -40,20 +40,19 @@ import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Goal which touches a timestamp file.
- *
- * @goal touch
- *
- * @phase process-sources
*/
+@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
public class MyMojo extends AbstractMojo {
/**
* Location of the file.
- * @parameter expression="${project.build.directory}"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}", required = true)
private File outputDirectory;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
index c9321cc7a..aa33bdc5b 100644
--- a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/pom.xml
@@ -13,6 +13,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>3.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/src/main/java/jar/MyMojo.java b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/src/main/java/jar/MyMojo.java
index df38cbcca..528781b2c 100644
--- a/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/src/main/java/jar/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3746/maven-mng3746-plugin/src/main/java/jar/MyMojo.java
@@ -38,31 +38,21 @@ import java.util.Properties;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
-/**
- * @goal test
- */
+@Mojo(name = "test")
public class MyMojo extends AbstractMojo {
- /**
- * @parameter
- * @required
- */
+ @Parameter(required = true)
private String check;
- /**
- * @parameter expression="${test.verification}"
- */
+ @Parameter(property = "test.verification")
private String verification;
- /**
- * @parameter expression="${test.usingCliValue}" default-value="false"
- */
+ @Parameter(property = "test.usingCliValue", defaultValue = "false")
private boolean usingCliValue;
- /**
- * @parameter default-value="${project.properties}"
- * @readonly
- */
+ @Parameter(defaultValue = "${project.properties}", readonly = true)
private Properties properties;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
index 7c4a806cd..d4fac1119 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
@@ -48,6 +48,12 @@ under the License.
<version>${maven-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
index 113c1d31a..7ce8e629c 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
@@ -45,33 +45,31 @@ import java.io.Writer;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
/**
* Test mojo.
- *
- * @goal test
*/
+@Mojo(name = "test")
public class TestMojo extends AbstractMojo {
/**
* The Maven project.
- *
- * @parameter expression="${project}"
*/
+ @Parameter(defaultValue = "${project}")
private MavenProject project;
/**
* The name to write.
- *
- * @parameter
*/
+ @Parameter
private String name;
/**
* The second name to write.
- *
- * @parameter
*/
+ @Parameter
private String secondName;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
index 1b58c7f15..b4ec8044d 100644
--- a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/pom.xml
@@ -39,6 +39,12 @@ under the License.
<artifactId>maven-resolver-provider</artifactId>
<version>${maven-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.15.2</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/src/main/java/org/apache/maven/its/plugin/TestMojo.java b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/src/main/java/org/apache/maven/its/plugin/TestMojo.java
index 658ed533b..2cb496b66 100644
--- a/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/src/main/java/org/apache/maven/its/plugin/TestMojo.java
+++ b/core-it-suite/src/test/resources/mng-6240-plugin-extension-aether-provider/plugin-extension/src/main/java/org/apache/maven/its/plugin/TestMojo.java
@@ -40,10 +40,9 @@ package org.apache.maven.its.mng6209.multiple.build.extensions.pluginb;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal test
- */
+@Mojo(name = "test")
public class TestMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {}
}
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
index c6eb1801b..97e761f2e 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
@@ -20,13 +20,10 @@ package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
-/**
- *
- * @phase process-sources
- */
-@Mojo(name = "test")
+@Mojo(name = "test", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
public class CoreItMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {
throw new MojoExecutionException("Should not be run");
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
index ae9ee2f03..e4d11e03f 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
@@ -22,15 +22,12 @@ import java.io.File;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-/**
- *
- * @phase validate
- */
-@Mojo(name = "check-property")
+@Mojo(name = "check-property", defaultPhase = LifecyclePhase.VALIDATE)
public class PropertyInterpolationMojo extends AbstractMojo {
/**
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
index 76912a72c..bc1539748 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
@@ -29,6 +29,7 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportException;
@@ -36,11 +37,10 @@ import org.apache.maven.reporting.MavenReportException;
/**
* Creates a properties file in the site output directory.
*
- * @goal info
*
* @author Benjamin Bentmann
- *
*/
+@Mojo(name = "info")
public class InfoReport extends AbstractMojo implements MavenReport {
/**
(maven-integration-testing) 02/02: Mark injected parameters as read-only
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 98b4d2dd014f4bcad3f26da89f369f99f3c7a063
Author: Vaclav Haisman <vh...@gmail.com>
AuthorDate: Sun Aug 9 12:21:35 2026 +0200
Mark injected parameters as read-only
---
.../test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java | 2 +-
.../test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java | 2 +-
.../mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java | 2 +-
.../mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java | 2 +-
.../src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java b/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
index e8a0aec3d..7b878a9f2 100644
--- a/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
+++ b/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.util.IOUtil;
@Mojo(name = "validate", defaultPhase = LifecyclePhase.VALIDATE)
public class Mojo3563 extends AbstractMojo {
- @Parameter(defaultValue = "${project}")
+ @Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
@Parameter(required = true)
diff --git a/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java b/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
index fea418d46..f3e0c9a3b 100644
--- a/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
+++ b/core-it-suite/src/test/resources/mng-3536/project/src/main/java/plugin/Mojo3563.java
@@ -35,7 +35,7 @@ import org.apache.maven.project.MavenProject;
@Mojo(name = "validate", defaultPhase = LifecyclePhase.VALIDATE)
public class Mojo3563 extends AbstractMojo {
- @Parameter(defaultValue = "${project}")
+ @Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
index 1b333f1ef..7ecd4c69c 100644
--- a/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
@@ -47,7 +47,7 @@ import org.codehaus.plexus.util.FileUtils;
@Mojo(name = "move-pom", defaultPhase = LifecyclePhase.PACKAGE)
public class MyMojo extends AbstractMojo {
- @Parameter(defaultValue = "${project}", required = true)
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
public void execute() throws MojoExecutionException {
diff --git a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
index b84a80355..dcaac8acd 100644
--- a/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
+++ b/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
@@ -53,7 +53,7 @@ public class MyMojo extends AbstractMojo {
@Parameter(defaultValue = "${project.build.directory}")
private String outputDirectory;
- @Parameter(defaultValue = "${reactorProjects}", required = true)
+ @Parameter(defaultValue = "${reactorProjects}", required = true, readonly = true)
private List reactorProjects;
/**
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
index 7ce8e629c..81d5e1e24 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
@@ -57,7 +57,7 @@ public class TestMojo extends AbstractMojo {
/**
* The Maven project.
*/
- @Parameter(defaultValue = "${project}")
+ @Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
/**