Skip to content

Commit 03b9832

Browse files
slawekjaranowskislawekjaranowski
committed
[MPIR-475] Drop usage of maven-artifact-transfer
1 parent 5c06da3 commit 03b9832

23 files changed

+107
-287
lines changed

‎pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ under the License.
189189
<groupId>org.apache.maven.resolver</groupId>
190190
<artifactId>maven-resolver-api</artifactId>
191191
<version>${resolverVersion}</version>
192-
<scope>test</scope>
192+
<scope>provided</scope>
193193
</dependency>
194194

195195
<dependency>
@@ -202,11 +202,6 @@ under the License.
202202
<artifactId>maven-common-artifact-filters</artifactId>
203203
<version>3.4.0</version>
204204
</dependency>
205-
<dependency>
206-
<groupId>org.apache.maven.shared</groupId>
207-
<artifactId>maven-artifact-transfer</artifactId>
208-
<version>0.13.1</version>
209-
</dependency>
210205

211206
<!-- SCM -->
212207
<dependency>
@@ -441,6 +436,10 @@ under the License.
441436
</execution>
442437
</executions>
443438
</plugin>
439+
<plugin>
440+
<groupId>org.eclipse.sisu</groupId>
441+
<artifactId>sisu-maven-plugin</artifactId>
442+
</plugin>
444443
</plugins>
445444
</build>
446445

‎src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.apache.maven.reporting.MavenReportException;
4444
import org.apache.maven.repository.RepositorySystem;
4545
import org.apache.maven.settings.Settings;
46-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
4746
import org.codehaus.plexus.i18n.I18N;
4847
import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
4948
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -130,11 +129,6 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
130129
// Mojo components
131130
// ----------------------------------------------------------------------
132131

133-
/**
134-
* Artifact Resolver component.
135-
*/
136-
protected final ArtifactResolver resolver;
137-
138132
/**
139133
* Artifact Factory component.
140134
*/
@@ -147,9 +141,7 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
147141

148142
protected final ProjectBuilder projectBuilder;
149143

150-
protected AbstractProjectInfoReport(
151-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
152-
this.resolver = resolver;
144+
protected AbstractProjectInfoReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
153145
this.repositorySystem = repositorySystem;
154146
this.i18n = i18n;
155147
this.projectBuilder = projectBuilder;
@@ -193,11 +185,6 @@ protected boolean isEmpty(Collection<?> coll) {
193185
return coll == null || coll.isEmpty();
194186
}
195187

196-
@Override
197-
protected MavenProject getProject() {
198-
return project;
199-
}
200-
201188
protected MavenSession getSession() {
202189
return session;
203190
}

‎src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.maven.project.ProjectBuilder;
3535
import org.apache.maven.reporting.MavenReportException;
3636
import org.apache.maven.repository.RepositorySystem;
37-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3837
import org.codehaus.plexus.i18n.I18N;
3938

4039
/**
@@ -47,9 +46,8 @@
4746
public class CiManagementReport extends AbstractProjectInfoReport {
4847

4948
@Inject
50-
public CiManagementReport(
51-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
52-
super(resolver, repositorySystem, i18n, projectBuilder);
49+
public CiManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
50+
super(repositorySystem, i18n, projectBuilder);
5351
}
5452
// ----------------------------------------------------------------------
5553
// Public methods

‎src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.Locale;
3434

3535
import org.apache.maven.artifact.Artifact;
36-
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
3736
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
3837
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
3938
import org.apache.maven.plugins.annotations.Mojo;
@@ -52,7 +51,6 @@
5251
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
5352
import org.apache.maven.shared.dependency.graph.DependencyNode;
5453
import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
55-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
5654
import org.codehaus.plexus.i18n.I18N;
5755
import org.codehaus.plexus.util.IOUtil;
5856

@@ -101,26 +99,20 @@ public class DependenciesReport extends AbstractProjectInfoReport {
10199
*/
102100
private final JarClassesAnalysis classesAnalyzer;
103101

104-
/**
105-
* Repository metadata component.
106-
*
107-
* @since 2.1
108-
*/
109-
private final RepositoryMetadataManager repositoryMetadataManager;
102+
private final RepositoryUtils repoUtils;
110103

111104
@Inject
112105
protected DependenciesReport(
113-
ArtifactResolver resolver,
114106
RepositorySystem repositorySystem,
115107
I18N i18n,
116108
ProjectBuilder projectBuilder,
117109
@Named("default") DependencyGraphBuilder dependencyGraphBuilder,
118110
JarClassesAnalysis classesAnalyzer,
119-
RepositoryMetadataManager repositoryMetadataManager) {
120-
super(resolver, repositorySystem, i18n, projectBuilder);
111+
RepositoryUtils repoUtils) {
112+
super(repositorySystem, i18n, projectBuilder);
121113
this.dependencyGraphBuilder = dependencyGraphBuilder;
122114
this.classesAnalyzer = classesAnalyzer;
123-
this.repositoryMetadataManager = repositoryMetadataManager;
115+
this.repoUtils = repoUtils;
124116
}
125117

126118
// ----------------------------------------------------------------------
@@ -148,22 +140,6 @@ public void executeReport(Locale locale) {
148140
getLog().error("Cannot copy resources", e);
149141
}
150142

151-
ProjectBuildingRequest buildingRequest =
152-
new DefaultProjectBuildingRequest(getSession().getProjectBuildingRequest());
153-
buildingRequest.setLocalRepository(localRepository);
154-
buildingRequest.setRemoteRepositories(remoteRepositories);
155-
buildingRequest.setPluginArtifactRepositories(pluginRepositories);
156-
157-
RepositoryUtils repoUtils = new RepositoryUtils(
158-
getLog(),
159-
projectBuilder,
160-
repositorySystem,
161-
resolver,
162-
remoteRepositories,
163-
pluginRepositories,
164-
buildingRequest,
165-
repositoryMetadataManager);
166-
167143
DependencyNode dependencyNode = resolveProject();
168144

169145
Dependencies dependencies = new Dependencies(project, dependencyNode, classesAnalyzer);
@@ -179,9 +155,6 @@ public void executeReport(Locale locale) {
179155
dependencyNode,
180156
config,
181157
repoUtils,
182-
repositorySystem,
183-
projectBuilder,
184-
buildingRequest,
185158
getLicenseMappings());
186159
r.render();
187160
}

‎src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.apache.maven.shared.dependency.graph.traversal.CollectingDependencyNodeVisitor;
6161
import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
6262
import org.apache.maven.shared.dependency.graph.traversal.FilteringDependencyNodeVisitor;
63-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
6463
import org.codehaus.plexus.i18n.I18N;
6564

6665
/**
@@ -100,12 +99,11 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport {
10099

101100
@Inject
102101
protected DependencyConvergenceReport(
103-
ArtifactResolver resolver,
104102
RepositorySystem repositorySystem,
105103
I18N i18n,
106104
ProjectBuilder projectBuilder,
107105
DependencyCollectorBuilder dependencyCollectorBuilder) {
108-
super(resolver, repositorySystem, i18n, projectBuilder);
106+
super(repositorySystem, i18n, projectBuilder);
109107
this.dependencyCollectorBuilder = dependencyCollectorBuilder;
110108
}
111109

‎src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.maven.project.ProjectBuilder;
3030
import org.apache.maven.reporting.MavenReportException;
3131
import org.apache.maven.repository.RepositorySystem;
32-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3332
import org.codehaus.plexus.i18n.I18N;
3433

3534
/**
@@ -57,9 +56,8 @@ public final class DependencyInformationReport extends AbstractProjectInfoReport
5756
protected String packaging;
5857

5958
@Inject
60-
public DependencyInformationReport(
61-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
62-
super(resolver, repositorySystem, i18n, projectBuilder);
59+
public DependencyInformationReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
60+
super(repositorySystem, i18n, projectBuilder);
6361
}
6462

6563
// ----------------------------------------------------------------------

‎src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Locale;
2424

2525
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
26-
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
2726
import org.apache.maven.plugins.annotations.Mojo;
2827
import org.apache.maven.plugins.annotations.ResolutionScope;
2928
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -34,7 +33,6 @@
3433
import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer;
3534
import org.apache.maven.reporting.MavenReportException;
3635
import org.apache.maven.repository.RepositorySystem;
37-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3836
import org.codehaus.plexus.i18n.I18N;
3937

4038
/**
@@ -66,24 +64,18 @@ public class DependencyManagementReport extends AbstractProjectInfoReport {
6664
*/
6765
protected final ArtifactMetadataSource artifactMetadataSource;
6866

69-
/**
70-
* Repository metadata component.
71-
*
72-
* @since 2.3
73-
*/
74-
private final RepositoryMetadataManager repositoryMetadataManager;
67+
private final RepositoryUtils repoUtils;
7568

7669
@Inject
7770
protected DependencyManagementReport(
78-
ArtifactResolver resolver,
7971
RepositorySystem repositorySystem,
8072
I18N i18n,
8173
ProjectBuilder projectBuilder,
8274
ArtifactMetadataSource artifactMetadataSource,
83-
RepositoryMetadataManager repositoryMetadataManager) {
84-
super(resolver, repositorySystem, i18n, projectBuilder);
75+
RepositoryUtils repoUtils) {
76+
super(repositorySystem, i18n, projectBuilder);
8577
this.artifactMetadataSource = artifactMetadataSource;
86-
this.repositoryMetadataManager = repositoryMetadataManager;
78+
this.repoUtils = repoUtils;
8779
}
8880

8981
// ----------------------------------------------------------------------
@@ -109,16 +101,6 @@ public void executeReport(Locale locale) {
109101
buildingRequest.setPluginArtifactRepositories(pluginRepositories);
110102
buildingRequest.setProcessPlugins(false);
111103

112-
RepositoryUtils repoUtils = new RepositoryUtils(
113-
getLog(),
114-
projectBuilder,
115-
repositorySystem,
116-
resolver,
117-
remoteRepositories,
118-
pluginRepositories,
119-
buildingRequest,
120-
repositoryMetadataManager);
121-
122104
DependencyManagementRenderer r = new DependencyManagementRenderer(
123105
getSink(),
124106
locale,
@@ -127,7 +109,6 @@ public void executeReport(Locale locale) {
127109
getManagementDependencies(),
128110
artifactMetadataSource,
129111
repositorySystem,
130-
projectBuilder,
131112
buildingRequest,
132113
repoUtils,
133114
getLicenseMappings());

‎src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.maven.project.ProjectBuilder;
3030
import org.apache.maven.reporting.MavenReportException;
3131
import org.apache.maven.repository.RepositorySystem;
32-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3332
import org.codehaus.plexus.i18n.I18N;
3433
import org.codehaus.plexus.util.StringUtils;
3534

@@ -43,9 +42,8 @@
4342
public class DistributionManagementReport extends AbstractProjectInfoReport {
4443

4544
@Inject
46-
public DistributionManagementReport(
47-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
48-
super(resolver, repositorySystem, i18n, projectBuilder);
45+
public DistributionManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
46+
super(repositorySystem, i18n, projectBuilder);
4947
}
5048
// ----------------------------------------------------------------------
5149
// Public methods

‎src/main/java/org/apache/maven/report/projectinfo/IndexReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.maven.project.ProjectBuilder;
3333
import org.apache.maven.project.ProjectBuildingRequest;
3434
import org.apache.maven.repository.RepositorySystem;
35-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3635
import org.codehaus.plexus.i18n.I18N;
3736

3837
/**
@@ -46,9 +45,8 @@
4645
public class IndexReport extends AbstractProjectInfoReport {
4746

4847
@Inject
49-
public IndexReport(
50-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
51-
super(resolver, repositorySystem, i18n, projectBuilder);
48+
public IndexReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
49+
super(repositorySystem, i18n, projectBuilder);
5250
}
5351
// ----------------------------------------------------------------------
5452
// Public methods

‎src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.maven.project.ProjectBuilder;
3030
import org.apache.maven.reporting.MavenReportException;
3131
import org.apache.maven.repository.RepositorySystem;
32-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3332
import org.codehaus.plexus.i18n.I18N;
3433

3534
/**
@@ -42,9 +41,8 @@
4241
public class IssueManagementReport extends AbstractProjectInfoReport {
4342

4443
@Inject
45-
public IssueManagementReport(
46-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
47-
super(resolver, repositorySystem, i18n, projectBuilder);
44+
public IssueManagementReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
45+
super(repositorySystem, i18n, projectBuilder);
4846
}
4947
// ----------------------------------------------------------------------
5048
// Public methods

‎src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.apache.maven.reporting.MavenReportException;
4141
import org.apache.maven.repository.RepositorySystem;
4242
import org.apache.maven.settings.Settings;
43-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
4443
import org.codehaus.plexus.i18n.I18N;
4544
import org.codehaus.plexus.util.StringUtils;
4645

@@ -81,9 +80,8 @@ public class LicensesReport extends AbstractProjectInfoReport {
8180
private String licenseFileEncoding;
8281

8382
@Inject
84-
public LicensesReport(
85-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
86-
super(resolver, repositorySystem, i18n, projectBuilder);
83+
public LicensesReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
84+
super(repositorySystem, i18n, projectBuilder);
8785
}
8886

8987
// ----------------------------------------------------------------------

‎src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.maven.project.ProjectBuilder;
3535
import org.apache.maven.reporting.MavenReportException;
3636
import org.apache.maven.repository.RepositorySystem;
37-
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
3837
import org.codehaus.plexus.i18n.I18N;
3938
import org.codehaus.plexus.util.StringUtils;
4039

@@ -49,9 +48,8 @@
4948
public class MailingListsReport extends AbstractProjectInfoReport {
5049

5150
@Inject
52-
public MailingListsReport(
53-
ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
54-
super(resolver, repositorySystem, i18n, projectBuilder);
51+
public MailingListsReport(RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
52+
super(repositorySystem, i18n, projectBuilder);
5553
}
5654
// ----------------------------------------------------------------------
5755
// Public methods

0 commit comments

Comments
 (0)