[MPIR-475] Drop usage of maven-artifact-transfer

apache · Jan 9, 2025 · 03b9832 · 03b9832
1 parent 5c06da3
commit 03b9832
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 287 deletions.
diff --git a/pom.xml b/pom.xml
@@ -189,7 +189,7 @@ under the License.
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-api</artifactId>
       <version>${resolverVersion}</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -202,11 +202,6 @@ under the License.
       <artifactId>maven-common-artifact-filters</artifactId>
       <version>3.4.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-artifact-transfer</artifactId>
-      <version>0.13.1</version>
-    </dependency>
 
     <!-- SCM -->
     <dependency>
@@ -441,6 +436,10 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -43,7 +43,6 @@
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
 import org.codehaus.plexus.interpolation.InterpolationException;
@@ -130,11 +129,6 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
     // Mojo components
     // ----------------------------------------------------------------------
 
-    /**
-     * Artifact Resolver component.
-     */
-    protected final ArtifactResolver resolver;
-
     /**
      * Artifact Factory component.
      */
@@ -147,9 +141,7 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
 
     protected final ProjectBuilder projectBuilder;
 
-    protected AbstractProjectInfoReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        this.resolver = resolver;
+    protected AbstractProjectInfoReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
         this.repositorySystem = repositorySystem;
         this.i18n = i18n;
         this.projectBuilder = projectBuilder;
@@ -193,11 +185,6 @@ protected boolean isEmpty(Collection<?> coll) {
         return coll == null || coll.isEmpty();
     }
 
-    @Override
-    protected MavenProject getProject() {
-        return project;
-    }
-
     protected MavenSession getSession() {
         return session;
     }

diff --git a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
@@ -34,7 +34,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -47,9 +46,8 @@
 public class CiManagementReport extends AbstractProjectInfoReport {
 
     @Inject
-    public CiManagementReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public CiManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
     // ----------------------------------------------------------------------
     // Public methods

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -33,7 +33,6 @@
 import java.util.Locale;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -52,7 +51,6 @@
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
 import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.IOUtil;
 
@@ -101,26 +99,20 @@ public class DependenciesReport extends AbstractProjectInfoReport {
      */
     private final JarClassesAnalysis classesAnalyzer;
 
-    /**
-     * Repository metadata component.
-     *
-     * @since 2.1
-     */
-    private final RepositoryMetadataManager repositoryMetadataManager;
+    private final RepositoryUtils repoUtils;
 
     @Inject
     protected DependenciesReport(
-            ArtifactResolver resolver,
             RepositorySystem repositorySystem,
             I18N i18n,
             ProjectBuilder projectBuilder,
             @Named("default") DependencyGraphBuilder dependencyGraphBuilder,
             JarClassesAnalysis classesAnalyzer,
-            RepositoryMetadataManager repositoryMetadataManager) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+            RepositoryUtils repoUtils) {
+        super(repositorySystem, i18n, projectBuilder);
         this.dependencyGraphBuilder = dependencyGraphBuilder;
         this.classesAnalyzer = classesAnalyzer;
-        this.repositoryMetadataManager = repositoryMetadataManager;
+        this.repoUtils = repoUtils;
     }
 
     // ----------------------------------------------------------------------
@@ -148,22 +140,6 @@ public void executeReport(Locale locale) {
             getLog().error("Cannot copy resources", e);
         }
 
-        ProjectBuildingRequest buildingRequest =
-                new DefaultProjectBuildingRequest(getSession().getProjectBuildingRequest());
-        buildingRequest.setLocalRepository(localRepository);
-        buildingRequest.setRemoteRepositories(remoteRepositories);
-        buildingRequest.setPluginArtifactRepositories(pluginRepositories);
-
-        RepositoryUtils repoUtils = new RepositoryUtils(
-                getLog(),
-                projectBuilder,
-                repositorySystem,
-                resolver,
-                remoteRepositories,
-                pluginRepositories,
-                buildingRequest,
-                repositoryMetadataManager);
-
         DependencyNode dependencyNode = resolveProject();
 
         Dependencies dependencies = new Dependencies(project, dependencyNode, classesAnalyzer);
@@ -179,9 +155,6 @@ public void executeReport(Locale locale) {
                 dependencyNode,
                 config,
                 repoUtils,
-                repositorySystem,
-                projectBuilder,
-                buildingRequest,
                 getLicenseMappings());
         r.render();
     }

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -60,7 +60,6 @@
 import org.apache.maven.shared.dependency.graph.traversal.CollectingDependencyNodeVisitor;
 import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
 import org.apache.maven.shared.dependency.graph.traversal.FilteringDependencyNodeVisitor;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -100,12 +99,11 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport {
 
     @Inject
     protected DependencyConvergenceReport(
-            ArtifactResolver resolver,
             RepositorySystem repositorySystem,
             I18N i18n,
             ProjectBuilder projectBuilder,
             DependencyCollectorBuilder dependencyCollectorBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+        super(repositorySystem, i18n, projectBuilder);
         this.dependencyCollectorBuilder = dependencyCollectorBuilder;
     }
 

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
@@ -29,7 +29,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -57,9 +56,8 @@ public final class DependencyInformationReport extends AbstractProjectInfoReport
     protected String packaging;
 
     @Inject
-    public DependencyInformationReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public DependencyInformationReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
 
     // ----------------------------------------------------------------------

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
@@ -23,7 +23,6 @@
 import java.util.Locale;
 
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -34,7 +33,6 @@
 import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -66,24 +64,18 @@ public class DependencyManagementReport extends AbstractProjectInfoReport {
      */
     protected final ArtifactMetadataSource artifactMetadataSource;
 
-    /**
-     * Repository metadata component.
-     *
-     * @since 2.3
-     */
-    private final RepositoryMetadataManager repositoryMetadataManager;
+    private final RepositoryUtils repoUtils;
 
     @Inject
     protected DependencyManagementReport(
-            ArtifactResolver resolver,
             RepositorySystem repositorySystem,
             I18N i18n,
             ProjectBuilder projectBuilder,
             ArtifactMetadataSource artifactMetadataSource,
-            RepositoryMetadataManager repositoryMetadataManager) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+            RepositoryUtils repoUtils) {
+        super(repositorySystem, i18n, projectBuilder);
         this.artifactMetadataSource = artifactMetadataSource;
-        this.repositoryMetadataManager = repositoryMetadataManager;
+        this.repoUtils = repoUtils;
     }
 
     // ----------------------------------------------------------------------
@@ -109,16 +101,6 @@ public void executeReport(Locale locale) {
         buildingRequest.setPluginArtifactRepositories(pluginRepositories);
         buildingRequest.setProcessPlugins(false);
 
-        RepositoryUtils repoUtils = new RepositoryUtils(
-                getLog(),
-                projectBuilder,
-                repositorySystem,
-                resolver,
-                remoteRepositories,
-                pluginRepositories,
-                buildingRequest,
-                repositoryMetadataManager);
-
         DependencyManagementRenderer r = new DependencyManagementRenderer(
                 getSink(),
                 locale,
@@ -127,7 +109,6 @@ public void executeReport(Locale locale) {
                 getManagementDependencies(),
                 artifactMetadataSource,
                 repositorySystem,
-                projectBuilder,
                 buildingRequest,
                 repoUtils,
                 getLicenseMappings());

diff --git a/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java
@@ -29,7 +29,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -43,9 +42,8 @@
 public class DistributionManagementReport extends AbstractProjectInfoReport {
 
     @Inject
-    public DistributionManagementReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public DistributionManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
     // ----------------------------------------------------------------------
     // Public methods

diff --git a/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java b/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java
@@ -32,7 +32,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -46,9 +45,8 @@
 public class IndexReport extends AbstractProjectInfoReport {
 
     @Inject
-    public IndexReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public IndexReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
     // ----------------------------------------------------------------------
     // Public methods

diff --git a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
@@ -29,7 +29,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -42,9 +41,8 @@
 public class IssueManagementReport extends AbstractProjectInfoReport {
 
     @Inject
-    public IssueManagementReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public IssueManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
     // ----------------------------------------------------------------------
     // Public methods

diff --git a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
@@ -40,7 +40,6 @@
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -81,9 +80,8 @@ public class LicensesReport extends AbstractProjectInfoReport {
     private String licenseFileEncoding;
 
     @Inject
-    public LicensesReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public LicensesReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
 
     // ----------------------------------------------------------------------

diff --git a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
@@ -34,7 +34,6 @@
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -49,9 +48,8 @@
 public class MailingListsReport extends AbstractProjectInfoReport {
 
     @Inject
-    public MailingListsReport(
-            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
-        super(resolver, repositorySystem, i18n, projectBuilder);
+    public MailingListsReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(repositorySystem, i18n, projectBuilder);
     }
     // ----------------------------------------------------------------------
     // Public methods