You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2023/11/05 22:48:04 UTC
(maven-dependency-plugin) 01/01: [MDEP-894] - Use @Component instead of @Parameter for session/project
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MDEP-894
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit ad2af9594a3381b99d11a07e726ee607c01a16dc
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 5 23:45:02 2023 +0100
[MDEP-894] - Use @Component instead of @Parameter for session/project
---
.../org/apache/maven/plugins/dependency/AbstractDependencyMojo.java | 4 ++--
.../org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java | 4 ++--
src/main/java/org/apache/maven/plugins/dependency/GetMojo.java | 2 +-
.../java/org/apache/maven/plugins/dependency/ListClassesMojo.java | 2 +-
.../org/apache/maven/plugins/dependency/ListRepositoriesMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/dependency/PropertiesMojo.java | 3 ++-
.../org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java | 4 ++--
.../apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java | 2 +-
.../org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java | 3 ++-
.../apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java | 3 ++-
.../apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java | 2 +-
.../plugins/dependency/fromDependencies/UnpackDependenciesMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java | 4 ++--
13 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
index 68cc286c..c57bc99d 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
@@ -59,7 +59,7 @@ public abstract class AbstractDependencyMojo extends AbstractMojo {
/**
* POM
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
/**
@@ -83,7 +83,7 @@ public abstract class AbstractDependencyMojo extends AbstractMojo {
/**
* The Maven session
*/
- @Parameter(defaultValue = "${session}", readonly = true, required = true)
+ @Component
protected MavenSession session;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
index 4e1be1b3..06efbe74 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -25,9 +25,9 @@ import java.util.Locale;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+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;
import org.apache.maven.project.MavenProject;
/**
@@ -43,7 +43,7 @@ public class DisplayAncestorsMojo extends AbstractMojo {
/**
* POM
*/
- @Parameter(defaultValue = "${project}", readonly = true)
+ @Component
private MavenProject project;
@Override
diff --git a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
index 45c43125..d0b86033 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
@@ -59,7 +59,7 @@ import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverE
public class GetMojo extends AbstractMojo {
private static final Pattern ALT_REPO_SYNTAX_PATTERN = Pattern.compile("(.+)::(.*)::(.+)");
- @Parameter(defaultValue = "${session}", required = true, readonly = true)
+ @Component
private MavenSession session;
@Component
diff --git a/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
index c34ad206..31ba07a9 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
@@ -62,7 +62,7 @@ import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverE
public class ListClassesMojo extends AbstractMojo {
private static final Pattern ALT_REPO_SYNTAX_PATTERN = Pattern.compile("(.+)::(.*)::(.+)");
- @Parameter(defaultValue = "${session}", required = true, readonly = true)
+ @Component
private MavenSession session;
@Component
diff --git a/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java
index f038e88a..1a5a28f3 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java
@@ -54,7 +54,7 @@ import org.eclipse.aether.util.graph.visitor.TreeDependencyVisitor;
public class ListRepositoriesMojo extends AbstractDependencyMojo {
@Component
- RepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
/**
* Displays a list of the repositories used by this build.
diff --git a/src/main/java/org/apache/maven/plugins/dependency/PropertiesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PropertiesMojo.java
index 06b692ef..4eed301d 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/PropertiesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/PropertiesMojo.java
@@ -23,6 +23,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
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.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -49,7 +50,7 @@ public class PropertiesMojo extends AbstractMojo {
/**
* The current Maven project
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
index 69f69694..460e3c76 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
@@ -88,10 +88,10 @@ public class PurgeLocalRepositoryMojo extends AbstractMojo {
/**
* The current Maven project.
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
- @Parameter(defaultValue = "${session}", readonly = true, required = true)
+ @Component
private MavenSession session;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
index 12f0423b..54d8acd2 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -66,7 +66,7 @@ public abstract class AbstractAnalyzeMojo extends AbstractMojo {
/**
* The Maven project to analyze.
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
index 113f5f00..079c95d9 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
@@ -33,6 +33,7 @@ import org.apache.maven.model.Exclusion;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
@@ -53,7 +54,7 @@ public class AnalyzeDepMgt extends AbstractMojo {
/**
*
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
index ab5bed3a..a4c965df 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
@@ -34,6 +34,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -65,7 +66,7 @@ public class AnalyzeDuplicateMojo extends AbstractMojo {
/**
* The Maven project to analyze.
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
index 034d60aa..60c4f297 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
@@ -45,7 +45,7 @@ import org.codehaus.plexus.components.io.filemappers.FileMapper;
public class UnpackMojo extends AbstractFromConfigurationMojo {
@Component
- UnpackUtil unpackUtil;
+ private UnpackUtil unpackUtil;
/**
* Directory to store flag files after unpack
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java
index ba36a233..e1042b47 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java
@@ -51,7 +51,7 @@ import org.codehaus.plexus.components.io.filemappers.FileMapper;
public class UnpackDependenciesMojo extends AbstractFromDependenciesMojo {
@Component
- UnpackUtil unpackUtil;
+ private UnpackUtil unpackUtil;
/**
* A comma separated list of file patterns to include when unpacking the artifact. i.e.
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
index 9e8b10f7..960f101b 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
@@ -80,10 +80,10 @@ public class TreeMojo extends AbstractMojo {
/**
* The Maven project.
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Component
private MavenProject project;
- @Parameter(defaultValue = "${session}", readonly = true, required = true)
+ @Component
private MavenSession session;
@Parameter(property = "outputEncoding", defaultValue = "${project.reporting.outputEncoding}")