Skip to content

Deps: Resolver 2.0.18 and drop unused stuff #12036

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

Open
cstamas wants to merge 3 commits into
base: maven-3.10.x
Choose a base branch
from
Open

Deps: Resolver 2.0.18 and drop unused stuff #12036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eef4c32
Dep: Resolver 2.0.18 and drop unused stuff
cstamas May 11, 2026
643e4c5
Merge remote-tracking branch 'upstream/maven-3.10.x' into maven-3.10.…
cstamas May 12, 2026
c9f33b9
Merge remote-tracking branch 'upstream/maven-3.10.x' into maven-3.10.…
cstamas May 13, 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
12 changes: 3 additions & 9 deletions ...src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
import org.apache.maven.internal.RepositorySystemSessionFactory;
import org.apache.maven.model.ModelBase;
import org.apache.maven.repository.internal.MavenSessionBuilderSupplier;
import org.apache.maven.repository.internal.VersionFilterBuilder;
import org.apache.maven.repository.internal.scopes.Maven3ScopeManagerConfiguration;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
Expand All @@ -58,8 +56,7 @@
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.impl.scope.InternalScopeManager;
import org.eclipse.aether.internal.impl.scope.ScopeManagerImpl;
import org.eclipse.aether.collection.VersionFilterBuilder;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.LocalRepositoryManager;
import org.eclipse.aether.repository.RepositoryPolicy;
Expand Down Expand Up @@ -193,8 +190,6 @@ public class DefaultRepositorySystemSessionFactory implements RepositorySystemSe

private final GenericVersionScheme versionScheme = new GenericVersionScheme();

private final InternalScopeManager scopeManager = new ScopeManagerImpl(Maven3ScopeManagerConfiguration.INSTANCE);

/**
* For legacy consumers; hopefully nobody.
*/
Expand All @@ -218,8 +213,7 @@ public RepositorySystemSession.SessionBuilder newRepositorySessionBuilder(MavenE
configProps.putAll(request.getSystemProperties());
configProps.putAll(request.getUserProperties());

RepositorySystemSession.SessionBuilder mainSessionBuilder =
new MavenSessionBuilderSupplier(repoSystem, scopeManager).get();
RepositorySystemSession.SessionBuilder mainSessionBuilder = new MavenSessionBuilderSupplier(repoSystem).get();
mainSessionBuilder.setCache(request.getRepositoryCache());

mainSessionBuilder.setOffline(request.isOffline());
Expand Down Expand Up @@ -280,7 +274,7 @@ public RepositorySystemSession.SessionBuilder newRepositorySessionBuilder(MavenE
boolean dependencyManagerTransitivity =
ConfigUtils.getBoolean(configProps, false, MAVEN_RESOLVER_DEPENDENCY_MANAGER_TRANSITIVITY);
if (dependencyManagerTransitivity) {
mainSessionBuilder.setDependencyManager(new TransitiveDependencyManager(scopeManager));
mainSessionBuilder.setDependencyManager(new TransitiveDependencyManager());
}

DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
Expand Down
5 changes: 2 additions & 3 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 @@ -34,7 +34,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.repository.internal.VersionFilterBuilder;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
Expand All @@ -45,6 +44,7 @@
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.VersionFilterBuilder;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.graph.DependencyVisitor;
Expand Down Expand Up @@ -196,8 +196,7 @@ private DependencyNode resolveInternal(
AndDependencySelector.newInstance(session.getDependencySelector(), new WagonExcluder());

DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession(session);
pluginSession.setConfigProperty(
VersionFilterBuilder.MAVEN_VERSION_FILTER_SUPPRESSED, Boolean.TRUE.toString());
pluginSession.setConfigProperty(VersionFilterBuilder.VERSION_FILTER_SUPPRESSED, Boolean.TRUE.toString());
pluginSession.setDependencySelector(selector);
pluginSession.setDependencyGraphTransformer(session.getDependencyGraphTransformer());

Expand Down
24 changes: 8 additions & 16 deletions ...vider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.impl.scope.InternalScopeManager;
import org.eclipse.aether.internal.impl.scope.ManagedDependencyContextRefiner;
import org.eclipse.aether.internal.impl.scope.ManagedScopeDeriver;
import org.eclipse.aether.internal.impl.scope.ManagedScopeSelector;
import org.eclipse.aether.internal.impl.scope.OptionalDependencySelector;
import org.eclipse.aether.internal.impl.scope.ScopeDependencySelector;
import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
Expand All @@ -47,6 +43,9 @@
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
import org.eclipse.aether.util.graph.transformer.ConfigurableVersionSelector;
import org.eclipse.aether.util.graph.transformer.ConflictResolver;
import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner;
import org.eclipse.aether.util.graph.transformer.JavaScopeDeriver;
import org.eclipse.aether.util.graph.transformer.JavaScopeSelector;
import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector;
import org.eclipse.aether.util.graph.traverser.FatArtifactTraverser;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
Expand All @@ -64,11 +63,9 @@
*/
public class MavenSessionBuilderSupplier implements Supplier<SessionBuilder> {
protected final RepositorySystem repositorySystem;
protected final InternalScopeManager scopeManager;

public MavenSessionBuilderSupplier(RepositorySystem repositorySystem, InternalScopeManager scopeManager) {
public MavenSessionBuilderSupplier(RepositorySystem repositorySystem) {
this.repositorySystem = requireNonNull(repositorySystem);
this.scopeManager = requireNonNull(scopeManager);
}

protected void configureSessionBuilder(SessionBuilder session) {
Expand All @@ -78,7 +75,6 @@ protected void configureSessionBuilder(SessionBuilder session) {
key = "env." + (caseSensitive ? key : key.toUpperCase(Locale.ENGLISH));
session.setSystemProperty(key, value);
});
session.setScopeManager(scopeManager);
session.setDependencyTraverser(getDependencyTraverser());
session.setDependencyManager(getDependencyManager());
session.setDependencySelector(getDependencySelector());
Expand All @@ -87,16 +83,12 @@ protected void configureSessionBuilder(SessionBuilder session) {
session.setArtifactDescriptorPolicy(getArtifactDescriptorPolicy());
}

protected InternalScopeManager getScopeManager() {
return this.scopeManager;
}

protected DependencyTraverser getDependencyTraverser() {
return new FatArtifactTraverser();
}

protected DependencyManager getDependencyManager() {
return new ClassicDependencyManager(getScopeManager());
return new ClassicDependencyManager();
}

protected DependencySelector getDependencySelector() {
Expand All @@ -110,10 +102,10 @@ protected DependencyGraphTransformer getDependencyGraphTransformer() {
return new ChainedDependencyGraphTransformer(
new ConflictResolver(
new ConfigurableVersionSelector(),
new ManagedScopeSelector(getScopeManager()),
new JavaScopeSelector(),
new SimpleOptionalitySelector(),
new ManagedScopeDeriver(getScopeManager())),
new ManagedDependencyContextRefiner(getScopeManager()));
new JavaScopeDeriver()),
new JavaDependencyContextRefiner());
}

protected ArtifactTypeRegistry getArtifactTypeRegistry() {
Expand Down
47 changes: 0 additions & 47 deletions ...ver-provider/src/main/java/org/apache/maven/repository/internal/VersionFilterBuilder.java
View file
Open in desktop

This file was deleted.

176 changes: 0 additions & 176 deletions ...c/main/java/org/apache/maven/repository/internal/filters/DefaultVersionFilterBuilder.java
View file
Open in desktop

This file was deleted.

Loading
Loading