apache · slawekjaranowski · Sep 13, 2025 · Sep 13, 2025
diff --git a/...va/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/...va/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -50,8 +50,6 @@
 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 void setPrependGroupId(boolean prependGroupId) {
  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/...va/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java b/...va/org/apache/maven/plugins/dependency/fromDependencies/AbstractFromDependenciesMojo.java
@@ -26,8 +26,6 @@
 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
@@ -51,10 +51,7 @@
 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 @@ protected void appendArtifactPath(Artifact art, StringBuilder sb) {
  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
@@ -47,7 +47,6 @@
 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 @@ protected void doExecute() throws MojoExecutionException {
  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/...ain/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java b/...ain/java/org/apache/maven/plugins/dependency/fromDependencies/UnpackDependenciesMojo.java
@@ -39,8 +39,6 @@
 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
@@ -34,8 +34,6 @@
 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
@@ -28,8 +28,6 @@
 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 @@
 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
@@ -49,7 +49,6 @@
 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 @@
 @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 GoOfflineMojo(
  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 @@ private Set<Artifact> resolveDependableCoordinate(
 
  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());