Skip to content

[MNG-7667] Fix DownloadMojo to properly resolve #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cstamas merged 4 commits into from
Jan 16, 2023
Merged

[MNG-7667] Fix DownloadMojo to properly resolve #236

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4593c4e
[MNG-7667] Improve fix that cover m-p-p peculiarity
cstamas Jan 16, 2023
ebd2e38
Fix and make bootstrap resolve proper
cstamas Jan 16, 2023
b880b74
Simplify, collect does same (and merges) for us
cstamas Jan 16, 2023
8c10e1b
Reformat
cstamas Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions .../maven-it-plugin-bootstrap/src/main/java/org/apache/maven/its/bootstrap/DownloadMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
Expand All @@ -42,7 +40,6 @@
import org.apache.maven.project.ProjectBuildingRequest;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.DependencyRequest;
Expand Down Expand Up @@ -80,9 +77,6 @@ public class DownloadMojo
@Component
private MavenSession session;

@Component
private ArtifactHandlerManager artifactHandlerManager;

@Override
public void execute() throws MojoFailureException
{
Expand Down Expand Up @@ -123,16 +117,17 @@ public void execute() throws MojoFailureException
ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
RepositorySystemSession repositorySystemSession = projectBuildingRequest.getRepositorySession();
List<RemoteRepository> repos = RepositoryUtils.toRepos( projectBuildingRequest.getRemoteRepositories() );
ArtifactTypeRegistry registry = RepositoryUtils.newArtifactTypeRegistry( artifactHandlerManager );

for ( Dependency dependency : dependencies )
{
try
{
org.eclipse.aether.graph.Dependency dep = RepositoryUtils.toDependency( dependency, registry );
DependencyRequest request = new DependencyRequest(
new CollectRequest( Collections.singletonList( dep ), Collections.emptyList(), repos ),
null );
System.out.println( "Resolving: " + dep.getArtifact() );
org.eclipse.aether.graph.Dependency root = RepositoryUtils.toDependency(
dependency, repositorySystemSession.getArtifactTypeRegistry() );
CollectRequest collectRequest = new CollectRequest( root, null, repos );
collectRequest.setRequestContext( "bootstrap" );
DependencyRequest request = new DependencyRequest( collectRequest, null ) ;
System.out.println( "Resolving: " + root.getArtifact() );
repositorySystem.resolveDependencies( repositorySystemSession, request );
}
catch ( Exception e )
Expand Down