Improve standalone ApiRunner to properly apply settings

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java

@@ -46,8 +46,6 @@
 import org.apache.maven.api.settings.Settings;
 import org.apache.maven.cling.invoker.mvnup.UpgradeContext;
 import org.apache.maven.impl.standalone.ApiRunner;
-import org.codehaus.plexus.components.secdispatcher.Dispatcher;
-import org.codehaus.plexus.components.secdispatcher.internal.dispatchers.LegacyDispatcher;
 import org.eclipse.aether.spi.connector.transport.TransporterFactory;
 import org.eclipse.aether.spi.connector.transport.http.ChecksumExtractor;
 import org.eclipse.aether.spi.io.PathProcessor;
@@ -257,18 +255,9 @@ protected static String remoteResolutionUnsupportedReason(UpgradeContext context
     }
 
     private Session createMaven4Session(UpgradeContext context) {
-        // Reuse the operator's real user home (settings.xml) and local repository so remote
-        // resolution follows the configured repository posture instead of the standalone
-        // test defaults. When settings were never loaded (unit tests, embedding), keep the
-        // isolated test user home.
-        boolean settingsLoaded = context.effectiveSettings != null;
-        Session session = ApiRunner.createSession(
-                injector -> {
-                    injector.bindInstance(Dispatcher.class, new LegacyDispatcher());
-                    injector.bindImplicit(TransporterFactoryConfig.class);
-                },
-                context.localRepositoryPath,
-                !settingsLoaded);
+        Session session = ApiRunner.createSession(injector -> {
+            injector.bindImplicit(TransporterFactoryConfig.class);
+        });
 
         if (remoteResolutionUnsupportedReason(context) != null) {
             // No remote repositories at all, rather than resolving from hardcoded public

impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionRangeResolver.java

@@ -18,7 +18,6 @@
  */
 package org.apache.maven.impl.resolver;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;

impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionResolver.java

@@ -281,8 +281,6 @@ private Versioning readVersions(
         return (versioning != null) ? versioning : Versioning.newInstance();
     }
 
-
-
     private void invalidMetadata(
             RepositorySystemSession session,
             RequestTrace trace,

impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSessionBuilderSupplier.java

@@ -80,7 +80,7 @@ public MavenSessionBuilderSupplier(RepositorySystem repositorySystem, boolean ma
                         : Maven4ScopeManagerConfiguration.INSTANCE);
     }
 
-    protected DependencyTraverser getDependencyTraverser() {
+    public DependencyTraverser getDependencyTraverser() {
         return new FatArtifactTraverser();
     }
 
@@ -99,15 +99,15 @@ public DependencyManager getDependencyManager(boolean transitive) {
         return new ClassicDependencyManager(getScopeManager());
     }
 
-    protected DependencySelector getDependencySelector() {
+    public DependencySelector getDependencySelector() {
         return new AndDependencySelector(
                 ScopeDependencySelector.legacy(
                         null, Arrays.asList(DependencyScope.TEST.id(), DependencyScope.PROVIDED.id())),
                 OptionalDependencySelector.fromDirect(),
                 new ExclusionDependencySelector());
     }
 
-    protected DependencyGraphTransformer getDependencyGraphTransformer() {
+    public DependencyGraphTransformer getDependencyGraphTransformer() {
         return new ChainedDependencyGraphTransformer(
                 new TypeCollector(),
                 new ConflictResolver(
@@ -126,13 +126,13 @@ protected DependencyGraphTransformer getDependencyGraphTransformer() {
      * <p>
      * Important: this "static" list of types should be in-sync with core provided types.
      */
-    protected ArtifactTypeRegistry getArtifactTypeRegistry() {
+    public ArtifactTypeRegistry getArtifactTypeRegistry() {
         DefaultArtifactTypeRegistry stereotypes = new DefaultArtifactTypeRegistry();
         new DefaultTypeProvider().types().forEach(t -> stereotypes.add(t.toArtifactType()));
         return stereotypes;
     }
 
-    protected ArtifactDescriptorPolicy getArtifactDescriptorPolicy() {
+    public ArtifactDescriptorPolicy getArtifactDescriptorPolicy() {
         return new SimpleArtifactDescriptorPolicy(true, true);
     }