From 6be7c1498af45a1ffec67e94233c3dd6bc000642 Mon Sep 17 00:00:00 2001 From: Vaclav Haisman Date: Sat, 8 Aug 2026 15:45:15 +0200 Subject: [PATCH] Migrate legacy plugin Javadoc annotations Replace legacy Maven Plugin Tools Javadoc tags in the remote-resources integration-test mojos with maven-plugin-annotations metadata. Add provided annotation dependencies using the filtered Plugin Tools version. --- src/it/MRRESOURCES-121-dependencies-ignored/pom.xml | 6 ++++++ .../src/main/java/org/apache/maven/MyMojo.java | 11 +++++------ src/it/maven-remote-resources-test/pom.xml | 6 ++++++ .../src/main/java/org/apache/maven/MyMojo.java | 11 +++++------ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/it/MRRESOURCES-121-dependencies-ignored/pom.xml b/src/it/MRRESOURCES-121-dependencies-ignored/pom.xml index 0d500f7..09e214f 100644 --- a/src/it/MRRESOURCES-121-dependencies-ignored/pom.xml +++ b/src/it/MRRESOURCES-121-dependencies-ignored/pom.xml @@ -48,6 +48,12 @@ under the License. 3.8.1 test + + org.apache.maven.plugin-tools + maven-plugin-annotations + @version.maven-plugin-tools@ + provided + diff --git a/src/it/MRRESOURCES-121-dependencies-ignored/src/main/java/org/apache/maven/MyMojo.java b/src/it/MRRESOURCES-121-dependencies-ignored/src/main/java/org/apache/maven/MyMojo.java index bc7e823..41622e2 100644 --- a/src/it/MRRESOURCES-121-dependencies-ignored/src/main/java/org/apache/maven/MyMojo.java +++ b/src/it/MRRESOURCES-121-dependencies-ignored/src/main/java/org/apache/maven/MyMojo.java @@ -18,6 +18,9 @@ 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 java.io.File; import java.io.FileWriter; @@ -25,19 +28,15 @@ /** * 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() diff --git a/src/it/maven-remote-resources-test/pom.xml b/src/it/maven-remote-resources-test/pom.xml index 68d4215..b2890f8 100644 --- a/src/it/maven-remote-resources-test/pom.xml +++ b/src/it/maven-remote-resources-test/pom.xml @@ -38,6 +38,12 @@ under the License. 3.8.1 test + + org.apache.maven.plugin-tools + maven-plugin-annotations + @version.maven-plugin-tools@ + provided + diff --git a/src/it/maven-remote-resources-test/src/main/java/org/apache/maven/MyMojo.java b/src/it/maven-remote-resources-test/src/main/java/org/apache/maven/MyMojo.java index bc7e823..41622e2 100644 --- a/src/it/maven-remote-resources-test/src/main/java/org/apache/maven/MyMojo.java +++ b/src/it/maven-remote-resources-test/src/main/java/org/apache/maven/MyMojo.java @@ -18,6 +18,9 @@ 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 java.io.File; import java.io.FileWriter; @@ -25,19 +28,15 @@ /** * 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()