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 2024/03/23 12:30:43 UTC
(maven-plugin-tools) branch component created (now 35c7e33c)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch component
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
at 35c7e33c use @Component instead of @Parameter when possible
This branch includes the following new commits:
new 35c7e33c use @Component instead of @Parameter when possible
The 1 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.
(maven-plugin-tools) 01/01: use @Component instead of @Parameter when possible
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch component
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 35c7e33c98606cf2d32b00f847afece44c2ef98e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Mar 23 13:30:28 2024 +0100
use @Component instead of @Parameter when possible
---
.../org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java | 3 ++-
.../apache/maven/plugin/plugin/DescriptorGeneratorMojo.java | 11 ++++++-----
.../plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java | 3 ++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
index 031aeb9f..d6524aae 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -36,7 +37,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo {
/**
* The project currently being built.
*/
- @Parameter(defaultValue = "${project}", readonly = true)
+ @Component
protected MavenProject project;
/**
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 127e8a37..4c2e917a 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -48,7 +49,6 @@ import org.apache.maven.tools.plugin.generator.PluginDescriptorFilesGenerator;
import org.apache.maven.tools.plugin.scanner.MojoScanner;
import org.codehaus.plexus.component.repository.ComponentDependency;
import org.codehaus.plexus.util.ReaderFactory;
-import org.eclipse.aether.RepositorySystemSession;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -226,11 +226,12 @@ public class DescriptorGeneratorMojo extends AbstractGeneratorMojo {
*
* @since 3.7.0
*/
- @Parameter(defaultValue = "${settings}", readonly = true, required = true)
+ @Component
private Settings settings;
- @Parameter(defaultValue = "${repositorySystemSession}", readonly = true, required = true)
- private RepositorySystemSession repoSession;
+ @Component
+ private MavenSession mavenSession;
+
/**
* The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier
* Maven versions. Can be either one of the following formats:
@@ -346,7 +347,7 @@ public class DescriptorGeneratorMojo extends AbstractGeneratorMojo {
request.setEncoding(encoding);
request.setSkipErrorNoDescriptorsFound(skipErrorNoDescriptorsFound);
request.setDependencies(filterMojoDependencies());
- request.setRepoSession(repoSession);
+ request.setRepoSession(mavenSession.getRepositorySession());
request.setInternalJavadocBaseUrl(internalJavadocBaseUrl);
request.setInternalJavadocVersion(internalJavadocVersion);
request.setExternalJavadocBaseUrls(externalJavadocBaseUrls);
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
index c98ca295..f2778e80 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
@@ -25,6 +25,7 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -51,7 +52,7 @@ public class AddPluginArtifactMetadataMojo extends AbstractMojo {
/**
* The project artifact, which should have the <code>latest</code> metadata added to it.
*/
- @Parameter(defaultValue = "${project}", readonly = true)
+ @Component
private MavenProject project;
/**