You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2025/09/13 20:36:39 UTC
(maven-dependency-plugin) branch master updated: Simplify usage of RepositoryManager and DependencyResolver
This is an automated email from the ASF dual-hosted git repository.
sjaranowski 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 cf4ffcce Simplify usage of RepositoryManager and DependencyResolver
cf4ffcce is described below
commit cf4ffccef0c092f24f45f7bfa87da94393c1b4e5
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Sep 13 22:06:59 2025 +0200
Simplify usage of RepositoryManager and DependencyResolver
Move it where is used, not all Mojos need it
---
.../AbstractDependencyFilterMojo.java | 26 ----------------------
.../AbstractFromDependenciesMojo.java | 18 ++-------------
.../fromDependencies/BuildClasspathMojo.java | 22 +++---------------
.../fromDependencies/CopyDependenciesMojo.java | 22 ++++++------------
.../fromDependencies/UnpackDependenciesMojo.java | 16 +------------
.../dependency/resolvers/AbstractResolveMojo.java | 16 +------------
.../resolvers/CollectDependenciesMojo.java | 17 +-------------
.../dependency/resolvers/GoOfflineMojo.java | 17 +++++---------
.../plugins/dependency/resolvers/ListMojo.java | 14 +-----------
.../resolvers/OldResolveDependencySourcesMojo.java | 14 +-----------
.../resolvers/ResolveDependenciesMojo.java | 14 +-----------
.../resolvers/ResolveDependencySourcesMojo.java | 14 +-----------
.../dependency/resolvers/ResolvePluginsMojo.java | 17 +++++---------
.../resolvers/ResolveDependenciesMojoTest.java | 2 +-
14 files changed, 30 insertions(+), 199 deletions(-)
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 3b274c5f..14c040b6 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
@@ -50,8 +50,6 @@ import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter;
import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -233,33 +231,23 @@ public abstract class AbstractDependencyFilterMojo extends AbstractDependencyMoj
private final ResolverUtil resolverUtil;
- private final DependencyResolver dependencyResolver;
-
- private final RepositoryManager repositoryManager;
-
private final ProjectBuilder projectBuilder;
private final ArtifactHandlerManager artifactHandlerManager;
@Inject
- // CHECKSTYLE_OFF: ParameterNumber
protected AbstractDependencyFilterMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
super(session, buildContext, project);
this.resolverUtil = resolverUtil;
- this.dependencyResolver = dependencyResolver;
- this.repositoryManager = repositoryManager;
this.projectBuilder = projectBuilder;
this.artifactHandlerManager = artifactHandlerManager;
}
- // CHECKSTYLE_ON: ParameterNumber
/**
* Return an {@link ArtifactsFilter} indicating which artifacts must be filtered out.
@@ -524,18 +512,4 @@ public abstract class AbstractDependencyFilterMojo extends AbstractDependencyMoj
protected final ResolverUtil getResolverUtil() {
return resolverUtil;
}
-
- /**
- * @return {@link #dependencyResolver}
- */
- protected final DependencyResolver getDependencyResolver() {
- return dependencyResolver;
- }
-
- /**
- * @return {@link #repositoryManager}
- */
- protected final RepositoryManager getRepositoryManager() {
- return repositoryManager;
- }
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java
index 5f624e7a..275f35d0 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java
@@ -26,8 +26,6 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -114,27 +112,15 @@ public abstract class AbstractFromDependenciesMojo extends AbstractDependencyFil
@Parameter(property = "mdep.failOnMissingClassifierArtifact", defaultValue = "false")
protected boolean failOnMissingClassifierArtifact;
- // CHECKSTYLE_OFF: ParameterNumber
protected AbstractFromDependenciesMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
- }
- // CHECKSTYLE_ON: ParameterNumber
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
+ }
/**
* @return returns the output directory
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
index d108b1e3..28068ffb 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
@@ -51,10 +51,7 @@ import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -168,29 +165,17 @@ public class BuildClasspathMojo extends AbstractDependencyFilterMojo implements
private final MavenProjectHelper projectHelper;
@Inject
- // CHECKSTYLE_OFF: ParameterNumber
protected BuildClasspathMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager,
MavenProjectHelper projectHelper) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
this.projectHelper = projectHelper;
}
- // CHECKSTYLE_ON: ParameterNumber
/**
* Main entry into mojo. Gets the list of dependencies and iterates to create a classpath.
@@ -288,9 +273,8 @@ public class BuildClasspathMojo extends AbstractDependencyFilterMojo implements
String file = art.getFile().getPath();
// substitute the property for the local repo path to make the classpath file portable.
if (localRepoProperty != null && !localRepoProperty.isEmpty()) {
- ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
- File localBasedir = getRepositoryManager().getLocalRepositoryBasedir(projectBuildingRequest);
-
+ File localBasedir =
+ session.getRepositorySession().getLocalRepository().getBasedir();
file = StringUtils.replace(file, localBasedir.getAbsolutePath(), localRepoProperty);
}
sb.append(file);
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
index 8223d95c..1bb9c40e 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
@@ -47,7 +47,6 @@ import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.eclipse.aether.util.artifact.SubArtifact;
@@ -80,6 +79,8 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
private final ArtifactInstaller installer;
+ private final RepositoryManager repositoryManager;
+
/**
* Either append the artifact's baseVersion or uniqueVersion to the filename. Will only be used if
* {@link #isStripVersion()} is {@code false}.
@@ -106,31 +107,22 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
protected boolean copySignatures;
@Inject
- // CHECKSTYLE_OFF: ParameterNumber
+ @SuppressWarnings("checkstyle:ParameterNumber")
public CopyDependenciesMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager,
CopyUtil copyUtil,
ArtifactInstaller installer) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
this.copyUtil = copyUtil;
this.installer = installer;
+ this.repositoryManager = repositoryManager;
}
- // CHECKSTYLE_ON: ParameterNumber
/**
* Main entry into mojo. Gets the list of dependencies and iterates through calling copyArtifact.
@@ -165,8 +157,8 @@ public class CopyDependenciesMojo extends AbstractFromDependenciesMojo {
artifact, isStripVersion(), this.prependGroupId, this.useBaseVersion, this.stripClassifier);
}
} else {
- ProjectBuildingRequest buildingRequest = getRepositoryManager()
- .setLocalRepositoryBasedir(session.getProjectBuildingRequest(), outputDirectory);
+ ProjectBuildingRequest buildingRequest =
+ repositoryManager.setLocalRepositoryBasedir(session.getProjectBuildingRequest(), outputDirectory);
artifacts.forEach(artifact -> installArtifact(artifact, buildingRequest));
}
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 589564fc..dd018fd8 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
@@ -39,8 +39,6 @@ import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandle
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.components.io.filemappers.FileMapper;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -106,29 +104,17 @@ public class UnpackDependenciesMojo extends AbstractFromDependenciesMojo {
private final UnpackUtil unpackUtil;
@Inject
- // CHECKSTYLE_OFF: ParameterNumber
public UnpackDependenciesMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager,
UnpackUtil unpackUtil) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
this.unpackUtil = unpackUtil;
}
- // CHECKSTYLE_ON: ParameterNumber
/**
* Main entry into mojo. This method gets the dependencies and iterates through each one passing it to
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
index 434fea8b..6abcb140 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
@@ -34,8 +34,6 @@ import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -68,27 +66,15 @@ public abstract class AbstractResolveMojo extends AbstractDependencyFilterMojo {
@Parameter(property = "excludeReactor", defaultValue = "true")
protected boolean excludeReactor;
- // CHECKSTYLE_OFF: ParameterNumber
protected AbstractResolveMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
- // CHECKSTYLE_ON: ParameterNumber
/**
* @return {@link FilterArtifacts}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/CollectDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/CollectDependenciesMojo.java
index 2751d171..bd892758 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/CollectDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/CollectDependenciesMojo.java
@@ -28,8 +28,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -58,26 +56,13 @@ import org.sonatype.plexus.build.incremental.BuildContext;
public class CollectDependenciesMojo extends ResolveDependenciesMojo {
@Inject
- // CHECKSTYLE_OFF: ParameterNumber
protected CollectDependenciesMojo(
MavenSession session,
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
- // CHECKSTYLE_ON: ParameterNumber
-
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
index 84242e2f..d503d65f 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
@@ -49,7 +49,6 @@ import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate
import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -63,6 +62,8 @@ import org.sonatype.plexus.build.incremental.BuildContext;
@Mojo(name = "go-offline", threadSafe = true)
public class GoOfflineMojo extends AbstractResolveMojo {
+ private final DependencyResolver dependencyResolver;
+
@Inject
// CHECKSTYLE_OFF: ParameterNumber
public GoOfflineMojo(
@@ -71,18 +72,10 @@ public class GoOfflineMojo extends AbstractResolveMojo {
MavenProject project,
ResolverUtil resolverUtil,
DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
+ this.dependencyResolver = dependencyResolver;
}
// CHECKSTYLE_ON: ParameterNumber
@@ -152,7 +145,7 @@ public class GoOfflineMojo extends AbstractResolveMojo {
for (DependableCoordinate dependableCoordinate : dependableCoordinates) {
final Iterable<ArtifactResult> artifactResults =
- getDependencyResolver().resolveDependencies(buildingRequest, dependableCoordinate, filter);
+ dependencyResolver.resolveDependencies(buildingRequest, dependableCoordinate, filter);
for (final ArtifactResult artifactResult : artifactResults) {
results.add(artifactResult.getArtifact());
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListMojo.java
index 81358579..306b12d9 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListMojo.java
@@ -27,8 +27,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -47,19 +45,9 @@ public class ListMojo extends ResolveDependenciesMojo {
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
// CHECKSTYLE_ON: ParameterNumber
// alias for dependency:resolve
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java
index 828a5f24..866c1b84 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/OldResolveDependencySourcesMojo.java
@@ -28,8 +28,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -54,19 +52,9 @@ public class OldResolveDependencySourcesMojo extends ResolveDependencySourcesMoj
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
// CHECKSTYLE_ON: ParameterNumber
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
index 4402b489..62a5330e 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
@@ -49,8 +49,6 @@ import org.apache.maven.plugins.dependency.utils.markers.SourcesFileMarkerHandle
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -116,19 +114,9 @@ public class ResolveDependenciesMojo extends AbstractResolveMojo {
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
// CHECKSTYLE_ON: ParameterNumber
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
index a4d4a14d..24c7b7a6 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
@@ -29,8 +29,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.dependency.utils.ResolverUtil;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -55,19 +53,9 @@ public class ResolveDependencySourcesMojo extends ResolveDependenciesMojo {
BuildContext buildContext,
MavenProject project,
ResolverUtil resolverUtil,
- DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
}
// CHECKSTYLE_ON: ParameterNumber
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
index 4119af06..e925c238 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
@@ -48,7 +48,6 @@ import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate
import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -72,6 +71,8 @@ public class ResolvePluginsMojo extends AbstractResolveMojo {
@Parameter(property = "outputAbsoluteArtifactFilename", defaultValue = "false")
private boolean outputAbsoluteArtifactFilename;
+ private final DependencyResolver dependencyResolver;
+
@Inject
// CHECKSTYLE_OFF: ParameterNumber
public ResolvePluginsMojo(
@@ -80,18 +81,10 @@ public class ResolvePluginsMojo extends AbstractResolveMojo {
MavenProject project,
ResolverUtil resolverUtil,
DependencyResolver dependencyResolver,
- RepositoryManager repositoryManager,
ProjectBuilder projectBuilder,
ArtifactHandlerManager artifactHandlerManager) {
- super(
- session,
- buildContext,
- project,
- resolverUtil,
- dependencyResolver,
- repositoryManager,
- projectBuilder,
- artifactHandlerManager);
+ super(session, buildContext, project, resolverUtil, projectBuilder, artifactHandlerManager);
+ this.dependencyResolver = dependencyResolver;
}
// CHECKSTYLE_ON: ParameterNumber
@@ -191,7 +184,7 @@ public class ResolvePluginsMojo extends AbstractResolveMojo {
ProjectBuildingRequest buildingRequest = newResolveArtifactProjectBuildingRequest();
Iterable<ArtifactResult> artifactResults =
- getDependencyResolver().resolveDependencies(buildingRequest, artifact, null);
+ dependencyResolver.resolveDependencies(buildingRequest, artifact, null);
Set<Artifact> artifacts = new LinkedHashSet<>();
diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
index da3b9f8f..2af96776 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
@@ -111,7 +111,7 @@ public class ResolveDependenciesMojoTest extends AbstractDependencyMojoTestCase
}
private ResolveDependenciesMojo newMojo(final DependencyStatusSets dss) {
- ResolveDependenciesMojo mojo = new ResolveDependenciesMojo(null, null, null, null, null, null, null, null);
+ ResolveDependenciesMojo mojo = new ResolveDependenciesMojo(null, null, null, null, null, null);
mojo.results = dss;
return mojo;
}