This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 03be6355 Inject the ProjectDependencyAnalyzer map instead of the
Plexus container
03be6355 is described below
commit 03be63551821a7b768dd7114d2be0e68c26d14f9
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Nov 14 13:42:05 2026 +0100
Inject the ProjectDependencyAnalyzer map instead of the Plexus container
The analyze mojo constructors take a Map keyed by role hint, and
org.eclipse.sisu.plexus is no longer needed.
---
pom.xml | 5 -----
.../dependency/analyze/AbstractAnalyzeMojo.java | 18 ++++++++----------
.../maven/plugins/dependency/analyze/AnalyzeMojo.java | 8 +++++---
.../plugins/dependency/analyze/AnalyzeOnlyMojo.java | 8 +++++---
.../dependency/analyze/AbstractAnalyzeMojoTest.java | 14 ++++++++++----
5 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index dacc8751..b752535a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,11 +190,6 @@ under the License.
<artifactId>plexus-archiver</artifactId>
<version>${plexus-archiver.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- MNG-6607: needs to be overridden for commons-compress otherwise it
will appear earlier in the tree -->
<dependency>
<groupId>org.apache.commons</groupId>
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 de03690e..78b7dcd4 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
@@ -38,8 +38,6 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
import
org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzerException;
-import org.codehaus.plexus.PlexusContainer;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
/**
@@ -271,18 +269,18 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
private Set<String> excludedClasses;
/**
- * The plexusContainer to look up the {@link ProjectDependencyAnalyzer}
implementation depending on the mojo
+ * The {@link ProjectDependencyAnalyzer} implementations by role hint, to
select the one named by the mojo
* configuration.
*/
- private final PlexusContainer plexusContainer;
+ private final Map<String, ProjectDependencyAnalyzer> analyzers;
/**
* The Maven project to analyze.
*/
private final MavenProject project;
- protected AbstractAnalyzeMojo(PlexusContainer plexusContainer,
MavenProject project) {
- this.plexusContainer = plexusContainer;
+ protected AbstractAnalyzeMojo(Map<String, ProjectDependencyAnalyzer>
analyzers, MavenProject project) {
+ this.analyzers = analyzers;
this.project = project;
}
@@ -326,12 +324,12 @@ public abstract class AbstractAnalyzeMojo extends
AbstractMojo {
*/
protected ProjectDependencyAnalyzer createProjectDependencyAnalyzer()
throws MojoExecutionException {
- try {
- return plexusContainer.lookup(ProjectDependencyAnalyzer.class,
analyzer);
- } catch (ComponentLookupException exception) {
+ ProjectDependencyAnalyzer projectDependencyAnalyzer =
analyzers.get(analyzer);
+ if (projectDependencyAnalyzer == null) {
throw new MojoExecutionException(
- "Failed to instantiate ProjectDependencyAnalyser" + " /
role-hint " + analyzer, exception);
+ "Failed to instantiate ProjectDependencyAnalyser" + " /
role-hint " + analyzer);
}
+ return projectDependencyAnalyzer;
}
/**
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeMojo.java
index 1cab8753..74d9fd7a 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeMojo.java
@@ -20,12 +20,14 @@ package org.apache.maven.plugins.dependency.analyze;
import javax.inject.Inject;
+import java.util.Map;
+
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusContainer;
+import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
/**
* Analyzes the dependencies of this project and determines which are: used
and declared; used and undeclared; unused
@@ -47,7 +49,7 @@ public class AnalyzeMojo extends AbstractAnalyzeMojo {
// subclassed to provide annotations
@Inject
- public AnalyzeMojo(PlexusContainer plexusContainer, MavenProject project) {
- super(plexusContainer, project);
+ public AnalyzeMojo(Map<String, ProjectDependencyAnalyzer> analyzers,
MavenProject project) {
+ super(analyzers, project);
}
}
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeOnlyMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeOnlyMojo.java
index ba7d0ddd..ee572200 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeOnlyMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeOnlyMojo.java
@@ -20,11 +20,13 @@ package org.apache.maven.plugins.dependency.analyze;
import javax.inject.Inject;
+import java.util.Map;
+
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusContainer;
+import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
/**
* Analyzes the dependencies of this project and determines which are: used
and declared; used and undeclared; unused
@@ -52,7 +54,7 @@ public class AnalyzeOnlyMojo extends AbstractAnalyzeMojo {
// subclassed to provide annotations
@Inject
- public AnalyzeOnlyMojo(PlexusContainer plexusContainer, MavenProject
project) {
- super(plexusContainer, project);
+ public AnalyzeOnlyMojo(Map<String, ProjectDependencyAnalyzer> analyzers,
MavenProject project) {
+ super(analyzers, project);
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojoTest.java
b/src/test/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojoTest.java
index 60980d16..6b9b5794 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojoTest.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojoTest.java
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
-import org.codehaus.plexus.PlexusContainer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -90,14 +89,12 @@ class AbstractAnalyzeMojoTest {
when(analyzer.analyze(any(MavenProject.class), any()))
.thenReturn(new ProjectDependencyAnalysis(
Collections.emptySet(), setOf(jodaTime, commonsIo),
Collections.emptySet(), setOf(jodaTime)));
- PlexusContainer container = mock(PlexusContainer.class);
- when(container.lookup(ProjectDependencyAnalyzer.class,
"default")).thenReturn(analyzer);
MavenProject project = new MavenProject();
project.setGroupId("org.example");
project.setArtifactId("module-a");
project.setPackaging("jar");
- mojo = new AnalyzeOnlyMojo(container, project);
+ mojo = new AnalyzeOnlyMojo(Collections.singletonMap("default",
analyzer), project);
log = mock(Log.class);
mojo.setLog(log);
set(mojo, "analyzer", "default");
@@ -234,4 +231,13 @@ class AbstractAnalyzeMojoTest {
.isInstanceOf(MojoExecutionException.class)
.hasMessage("Cannot analyze dependencies");
}
+
+ @Test
+ void unknownAnalyzerFails() throws Exception {
+ set(mojo, "analyzer", "unknown");
+
+ assertThatThrownBy(mojo::execute)
+ .isInstanceOf(MojoExecutionException.class)
+ .hasMessage("Failed to instantiate ProjectDependencyAnalyser /
role-hint unknown");
+ }
}