This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch inject2
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 10817333f76428197be8d2016ec137739a80a66e
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Nov 17 08:31:14 2024 -0500
@Component --> @Inject
---
.../maven/plugins/dependency/AbstractDependencyMojo.java | 14 ++++++++------
.../maven/plugins/dependency/DisplayAncestorsMojo.java | 5 +++--
.../java/org/apache/maven/plugins/dependency/GetMojo.java | 12 +++++++-----
.../fromDependencies/AbstractDependencyFilterMojo.java | 12 +++++++-----
.../org/apache/maven/plugins/dependency/tree/TreeMojo.java | 6 ++++--
5 files changed, 29 insertions(+), 20 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 45e43be1..42385522 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
@@ -20,6 +20,8 @@ package org.apache.maven.plugins.dependency;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -42,7 +44,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
/**
* For IDE build support
*/
- @Component
+ @Inject
private BuildContext buildContext;
/**
@@ -57,7 +59,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
/**
* POM
*/
- @Component
+ @Inject
private MavenProject project;
/**
@@ -81,7 +83,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
/**
* The Maven session
*/
- @Component
+ @Inject
protected MavenSession session;
/**
@@ -124,7 +126,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
protected abstract void doExecute() throws MojoExecutionException,
MojoFailureException;
/**
- * @return Returns a new ProjectBuildingRequest populated from the current
session and the current project remote
+ * @return returns a new ProjectBuildingRequest populated from the current
session and the current project remote
* repositories, used to resolve artifacts.
*/
public ProjectBuildingRequest newResolveArtifactProjectBuildingRequest() {
@@ -132,7 +134,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
}
/**
- * @return Returns a new ProjectBuildingRequest populated from the current
session and the current project remote
+ * @return returns a new ProjectBuildingRequest populated from the current
session and the current project remote
* repositories, used to resolve plugins.
*/
protected ProjectBuildingRequest newResolvePluginProjectBuildingRequest() {
@@ -148,7 +150,7 @@ public abstract class AbstractDependencyMojo extends
AbstractMojo {
}
/**
- * @return Returns the project.
+ * @return returns the project
*/
public MavenProject getProject() {
return this.project;
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 4a52c015..dd4294bd 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -21,10 +21,11 @@ package org.apache.maven.plugins.dependency;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+
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.project.MavenProject;
@@ -42,7 +43,7 @@ public class DisplayAncestorsMojo extends AbstractMojo {
/**
* POM
*/
- @Component
+ @Inject
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 73b3eb31..9db67c32 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
@@ -24,6 +24,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.inject.Inject;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -59,16 +61,16 @@ import
org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverE
public class GetMojo extends AbstractMojo {
private static final Pattern ALT_REPO_SYNTAX_PATTERN =
Pattern.compile("(.+)::(.*)::(.+)");
- @Component
+ @Inject
private MavenSession session;
- @Component
+ @Inject
private ArtifactResolver artifactResolver;
- @Component
+ @Inject
private DependencyResolver dependencyResolver;
- @Component
+ @Inject
private ArtifactHandlerManager artifactHandlerManager;
/**
@@ -80,7 +82,7 @@ public class GetMojo extends AbstractMojo {
/**
* The repository system.
*/
- @Component
+ @Inject
private RepositorySystem repositorySystem;
private DefaultDependableCoordinate coordinate = new
DefaultDependableCoordinate();
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index c6a4633e..b12bb014 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -24,6 +24,8 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+import javax.inject.Inject;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -60,13 +62,13 @@ import
org.eclipse.aether.resolution.ArtifactResolutionException;
*/
public abstract class AbstractDependencyFilterMojo extends
AbstractDependencyMojo {
- @Component
+ @Inject
private ResolverUtil resolverUtil;
- @Component
+ @Inject
private DependencyResolver dependencyResolver;
- @Component
+ @Inject
private RepositoryManager repositoryManager;
/**
@@ -239,10 +241,10 @@ public abstract class AbstractDependencyFilterMojo
extends AbstractDependencyMoj
@Parameter(property = "mdep.prependGroupId", defaultValue = "false")
protected boolean prependGroupId = false;
- @Component
+ @Inject
private ProjectBuilder projectBuilder;
- @Component
+ @Inject
private ArtifactHandlerManager artifactHandlerManager;
/**
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 59c05448..1b9311f8 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
@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import javax.inject.Inject;
+
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.execution.MavenSession;
@@ -75,10 +77,10 @@ public class TreeMojo extends AbstractMojo {
/**
* The Maven project.
*/
- @Component
+ @Inject
private MavenProject project;
- @Component
+ @Inject
private MavenSession session;
@Parameter(property = "outputEncoding", defaultValue =
"${project.reporting.outputEncoding}")
