Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-8384] Make sure plugin's artifacts have a scope (#1928)

This commit is contained in:
Guillaume Nodet 2024-11-20 20:04:57 +01:00 committed by GitHub
parent 377bc3192c
commit 5c02857a96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
View File

@ -69,7 +69,7 @@ public class RepositoryUtils {
return (string == null || string.isEmpty()) ? null : string;
}
private static org.apache.maven.artifact.Artifact toArtifact(Dependency dependency) {
public static org.apache.maven.artifact.Artifact toArtifact(Dependency dependency) {
if (dependency == null) {
return null;
}

12
impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View File

@ -34,7 +34,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -121,7 +120,6 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyResult;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.slf4j.Logger;
@ -463,12 +461,10 @@ public class DefaultMavenPluginManager implements MavenPluginManager {
}
private List<Artifact> toMavenArtifacts(DependencyResult dependencyResult) {
List<Artifact> artifacts =
new ArrayList<>(dependencyResult.getArtifactResults().size());
dependencyResult.getArtifactResults().stream()
.filter(ArtifactResult::isResolved)
.forEach(a -> artifacts.add(RepositoryUtils.toArtifact(a.getArtifact())));
return Collections.unmodifiableList(artifacts);
return dependencyResult.getDependencyNodeResults().stream()
.filter(n -> n.getArtifact().getPath() != null)
.map(n -> RepositoryUtils.toArtifact(n.getDependency()))
.collect(Collectors.toUnmodifiableList());
}
private Map<String, ClassLoader> calcImports(