Skip to content

Feat: Align CP ordering with Maven 4 #12327

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 6 commits into from
Jun 19, 2026
Merged

Feat: Align CP ordering with Maven 4 #12327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3307d42
Feat: Align CP orderng with Maven 4
cstamas Jun 19, 2026
4ba5bda
Get rid of some more deprecations, fix Javadoc
cstamas Jun 19, 2026
aa137cf
Undo unrelated changes
cstamas Jun 19, 2026
aaa96fa
Update maven-core/src/main/java/org/apache/maven/plugin/internal/Plug…
cstamas Jun 19, 2026
e893793
Lift and add all to iface
cstamas Jun 19, 2026
d25d8c6
Tidy up
cstamas Jun 19, 2026
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
38 changes: 13 additions & 25 deletions maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
import java.io.Reader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -107,10 +105,10 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
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.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;

/**
* Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
Expand Down Expand Up @@ -389,17 +387,17 @@ private void createPluginRealm(
DependencyFilter dependencyFilter = project.getExtensionDependencyFilter();
dependencyFilter = AndDependencyFilter.newInstance(dependencyFilter, filter);

DependencyNode root = pluginDependenciesResolver.resolve(
DependencyResult result = pluginDependenciesResolver.resolvePluginAndFlatten(
plugin,
RepositoryUtils.toArtifact(pluginArtifact),
dependencyFilter,
project.getRemotePluginRepositories(),
repositorySession);

PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
root.accept(nlg);

pluginArtifacts = toMavenArtifacts(root, nlg);
pluginArtifacts = result.getArtifactResults().stream()
.filter(ArtifactResult::isResolved)
.map(r -> RepositoryUtils.toArtifact(r.getArtifact()))
.collect(Collectors.toList());

pluginRealm = classRealmManager.createPluginRealm(
plugin, parent, null, foreignImports, toAetherArtifacts(pluginArtifacts));
Expand Down Expand Up @@ -437,18 +435,6 @@ private List<org.eclipse.aether.artifact.Artifact> toAetherArtifacts(final List<
return new ArrayList<>(RepositoryUtils.toArtifacts(pluginArtifacts));
}

private List<Artifact> toMavenArtifacts(DependencyNode root, PreorderNodeListGenerator nlg) {
List<Artifact> artifacts = new ArrayList<>(nlg.getNodes().size());
RepositoryUtils.toArtifacts(artifacts, Collections.singleton(root), Collections.<String>emptyList(), null);
for (Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); ) {
Artifact artifact = it.next();
if (artifact.getFile() == null) {
it.remove();
}
}
return Collections.unmodifiableList(artifacts);
}

private Map<String, ClassLoader> calcImports(MavenProject project, ClassLoader parent, List<String> imports) {
Map<String, ClassLoader> foreignImports = new HashMap<>();

Expand Down Expand Up @@ -841,9 +827,11 @@ public ExtensionRealmCache.CacheRecord setupExtensionsRealm(
private List<Artifact> resolveExtensionArtifacts(
Plugin extensionPlugin, List<RemoteRepository> repositories, RepositorySystemSession session)
throws PluginResolutionException {
DependencyNode root = pluginDependenciesResolver.resolve(extensionPlugin, null, null, repositories, session);
PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
root.accept(nlg);
return toMavenArtifacts(root, nlg);
DependencyResult result =
pluginDependenciesResolver.resolvePluginAndFlatten(extensionPlugin, null, null, repositories, session);
return result.getArtifactResults().stream()
.filter(ArtifactResult::isResolved)
.map(r -> RepositoryUtils.toArtifact(r.getArtifact()))
.collect(Collectors.toList());
}
}
43 changes: 36 additions & 7 deletions ...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.resolution.DependencyResult;
import org.eclipse.aether.util.artifact.JavaScopes;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
Expand Down Expand Up @@ -98,6 +99,7 @@ private Artifact toArtifact(Plugin plugin, RepositorySystemSession session) {
session.getArtifactTypeRegistry().get("maven-plugin"));
}

@Override
public Artifact resolve(Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session)
throws PluginResolutionException {
RequestTrace trace = RequestTrace.newChild(null, plugin);
Expand Down Expand Up @@ -154,27 +156,56 @@ public Artifact resolve(Plugin plugin, List<RemoteRepository> repositories, Repo

/**
* @since 3.3.0
* @deprecated Is unused since 3.10.0
*/
@Deprecated
public DependencyNode resolveCoreExtension(
Plugin plugin,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException {
return resolveInternal(plugin, null /* pluginArtifact */, dependencyFilter, repositories, session)
.getRoot();
}

/**
* @since 3.10.0
*/
@Override
public DependencyResult resolveCoreExtensionAndFlatten(

@gnodet gnodet Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method is public but not declared on the PluginDependenciesResolver interface. BootstrapCoreExtensionManager calls it, so it depends on the concrete type. The old resolveCoreExtension had the same pattern, but since the interface is already being touched to add resolveAndFlatten, would it make sense to also promote this to the interface?

@cstamas cstamas Jun 19, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, will add new (and old) methods to interface. I just did not want to "stir too much".

Plugin plugin,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException {
return resolveInternal(plugin, null /* pluginArtifact */, dependencyFilter, repositories, session);
}

@Override
public DependencyNode resolve(
Plugin plugin,
Artifact pluginArtifact,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException {
return resolveInternal(plugin, pluginArtifact, dependencyFilter, repositories, session)
.getRoot();
}

@Override
public DependencyResult resolvePluginAndFlatten(
Plugin plugin,
Artifact pluginArtifact,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException {
return resolveInternal(plugin, pluginArtifact, dependencyFilter, repositories, session);
}

private DependencyNode resolveInternal(
private DependencyResult resolveInternal(
Plugin plugin,
Artifact pluginArtifact,
DependencyFilter dependencyFilter,
Expand All @@ -190,8 +221,6 @@ private DependencyNode resolveInternal(
DependencyFilter collectionFilter = new ScopeDependencyFilter("provided", "test");
DependencyFilter resolutionFilter = AndDependencyFilter.newInstance(collectionFilter, dependencyFilter);

DependencyNode node;

try {
DependencySelector selector =
AndDependencySelector.newInstance(session.getDependencySelector(), new WagonExcluder());
Expand Down Expand Up @@ -221,14 +250,16 @@ private DependencyNode resolveInternal(

request.setTrace(RequestTrace.newChild(trace, depRequest));

node = repoSystem.collectDependencies(pluginSession, request).getRoot();
DependencyNode node =
repoSystem.collectDependencies(pluginSession, request).getRoot();

if (logger.isDebugEnabled()) {
node.accept(new GraphLogger());
}

depRequest.setRoot(node);
repoSystem.resolveDependencies(session, depRequest);
return repoSystem.resolveDependencies(session, depRequest);

} catch (DependencyCollectionException e) {
throw new PluginResolutionException(
plugin, e.getResult().getExceptions(), logger.isDebugEnabled() ? e : null);
Expand All @@ -241,8 +272,6 @@ private DependencyNode resolveInternal(
.collect(Collectors.toList());
throw new PluginResolutionException(plugin, exceptions, logger.isDebugEnabled() ? e : null);
}

return node;
}

// Keep this class in sync with org.apache.maven.project.DefaultProjectDependenciesResolver.GraphLogger
Expand Down
41 changes: 41 additions & 0 deletions maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.DependencyResult;

/**
* Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility interface
Expand Down Expand Up @@ -61,12 +62,52 @@ Artifact resolve(Plugin plugin, List<RemoteRepository> repositories, RepositoryS
* @param session The repository session to use for resolving the plugin artifacts, must not be {@code null}.
* @return The dependency tree denoting the resolved plugin class path, never {@code null}.
* @throws PluginResolutionException If any dependency could not be resolved.
* @deprecated This method should be avoided, as it requires manual flattening; use {@link #resolvePluginAndFlatten(Plugin, Artifact, DependencyFilter, List, RepositorySystemSession)} instead to let Resolver handle it.
*/
@Deprecated
DependencyNode resolve(
Plugin plugin,
Artifact pluginArtifact,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException;

/**
* Resolves the runtime dependencies of the specified core extension (as {@link Plugin} as GAV carrier).
*
* @param plugin The plugin for which to resolve the dependencies, must not be {@code null}.
* @param dependencyFilter A filter to exclude artifacts from resolution (but not collection), may be {@code null}.
* @param repositories The plugin repositories to use for resolving the plugin artifacts, must not be {@code null}.
* @param session The repository session to use for resolving the plugin artifacts, must not be {@code null}.
* @return The dependency resolution result having the resolved extension class path but also the tree, never {@code null}.
* @throws PluginResolutionException If any dependency could not be resolved.
* @since 3.10.0
*/
DependencyResult resolveCoreExtensionAndFlatten(
Plugin plugin,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException;

/**
* Resolves the runtime dependencies of the specified plugin.
*
* @param plugin The plugin for which to resolve the dependencies, must not be {@code null}.
* @param pluginArtifact The plugin's main artifact, may be {@code null}.
* @param dependencyFilter A filter to exclude artifacts from resolution (but not collection), may be {@code null}.
* @param repositories The plugin repositories to use for resolving the plugin artifacts, must not be {@code null}.
* @param session The repository session to use for resolving the plugin artifacts, must not be {@code null}.
* @return The dependency resolution result having the resolved plugin class path but also the tree, never {@code null}.
* @throws PluginResolutionException If any dependency could not be resolved.
* @since 3.10.0
*/
DependencyResult resolvePluginAndFlatten(
Plugin plugin,
Artifact pluginArtifact,
DependencyFilter dependencyFilter,
List<RemoteRepository> repositories,
RepositorySystemSession session)
throws PluginResolutionException;
}
22 changes: 11 additions & 11 deletions ...n-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import org.apache.maven.RepositoryUtils;
import org.apache.maven.cli.internal.extension.model.CoreExtension;
Expand All @@ -35,7 +36,7 @@
import org.apache.maven.internal.aether.DefaultRepositorySystemSessionFactory;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver;
import org.apache.maven.plugin.internal.PluginDependenciesResolver;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
Expand All @@ -48,10 +49,10 @@
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyResult;
import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;

/**
* BootstrapCoreExtensionManager
Expand All @@ -64,7 +65,7 @@ public class BootstrapCoreExtensionManager {

private final Logger log;

private final DefaultPluginDependenciesResolver pluginDependenciesResolver;
private final PluginDependenciesResolver pluginDependenciesResolver;

private final DefaultRepositorySystemSessionFactory repositorySystemSessionFactory;

Expand All @@ -77,7 +78,7 @@ public class BootstrapCoreExtensionManager {
@Inject
public BootstrapCoreExtensionManager(
Logger log,
DefaultPluginDependenciesResolver pluginDependenciesResolver,
PluginDependenciesResolver pluginDependenciesResolver,
DefaultRepositorySystemSessionFactory repositorySystemSessionFactory,
CoreExports coreExports,
PlexusContainer container) {
Expand Down Expand Up @@ -174,13 +175,12 @@ private List<Artifact> resolveExtension(
plugin.setArtifactId(interpolator.interpolate(extension.getArtifactId()));
plugin.setVersion(interpolator.interpolate(extension.getVersion()));

DependencyNode root = pluginDependenciesResolver.resolveCoreExtension(
DependencyResult result = pluginDependenciesResolver.resolveCoreExtensionAndFlatten(
plugin, dependencyFilter, repositories, repoSession);
PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
root.accept(nlg);
List<Artifact> artifacts = nlg.getArtifacts(false);

return artifacts;
return result.getArtifactResults().stream()
.filter(ArtifactResult::isResolved)
.map(ArtifactResult::getArtifact)
.collect(Collectors.toList());
} catch (PluginResolutionException | InterpolationException e) {
throw new ExtensionResolutionException(extension, e);
}
Expand Down