Skip to content

Commit 6f9c3d9

Browse files
committed
use @component instead of @parameter when possible
1 parent d8fecbc commit 6f9c3d9

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import org.apache.maven.plugin.AbstractMojo;
2525
import org.apache.maven.plugin.MojoExecutionException;
26+
import org.apache.maven.plugins.annotations.Component;
2627
import org.apache.maven.plugins.annotations.Parameter;
2728
import org.apache.maven.project.MavenProject;
2829

@@ -36,7 +37,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo {
3637
/**
3738
* The project currently being built.
3839
*/
39-
@Parameter(defaultValue = "${project}", readonly = true)
40+
@Component
4041
protected MavenProject project;
4142

4243
/**

maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.maven.artifact.Artifact;
3030
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
3131
import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
32+
import org.apache.maven.execution.MavenSession;
3233
import org.apache.maven.plugin.MojoExecutionException;
3334
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
3435
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -48,7 +49,6 @@
4849
import org.apache.maven.tools.plugin.scanner.MojoScanner;
4950
import org.codehaus.plexus.component.repository.ComponentDependency;
5051
import org.codehaus.plexus.util.ReaderFactory;
51-
import org.eclipse.aether.RepositorySystemSession;
5252
import org.sonatype.plexus.build.incremental.BuildContext;
5353

5454
/**
@@ -226,11 +226,12 @@ public class DescriptorGeneratorMojo extends AbstractGeneratorMojo {
226226
*
227227
* @since 3.7.0
228228
*/
229-
@Parameter(defaultValue = "${settings}", readonly = true, required = true)
229+
@Component
230230
private Settings settings;
231231

232-
@Parameter(defaultValue = "${repositorySystemSession}", readonly = true, required = true)
233-
private RepositorySystemSession repoSession;
232+
@Component
233+
private MavenSession mavenSession;
234+
234235
/**
235236
* The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier
236237
* Maven versions. Can be either one of the following formats:
@@ -346,7 +347,7 @@ public void generate() throws MojoExecutionException {
346347
request.setEncoding(encoding);
347348
request.setSkipErrorNoDescriptorsFound(skipErrorNoDescriptorsFound);
348349
request.setDependencies(filterMojoDependencies());
349-
request.setRepoSession(repoSession);
350+
request.setRepoSession(mavenSession.getRepositorySession());
350351
request.setInternalJavadocBaseUrl(internalJavadocBaseUrl);
351352
request.setInternalJavadocVersion(internalJavadocVersion);
352353
request.setExternalJavadocBaseUrls(externalJavadocBaseUrls);

maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.maven.plugin.AbstractMojo;
2626
import org.apache.maven.plugin.MojoExecutionException;
2727
import org.apache.maven.plugin.descriptor.PluginDescriptor;
28+
import org.apache.maven.plugins.annotations.Component;
2829
import org.apache.maven.plugins.annotations.LifecyclePhase;
2930
import org.apache.maven.plugins.annotations.Mojo;
3031
import org.apache.maven.plugins.annotations.Parameter;
@@ -51,7 +52,7 @@ public class AddPluginArtifactMetadataMojo extends AbstractMojo {
5152
/**
5253
* The project artifact, which should have the <code>latest</code> metadata added to it.
5354
*/
54-
@Parameter(defaultValue = "${project}", readonly = true)
55+
@Component
5556
private MavenProject project;
5657

5758
/**

0 commit comments

Comments
 (0)