Resolver 2.0.12

.mvn/maven.config

@@ -1 +1,2 @@
--DsessionRootDirectory=${session.rootDirectory}
+-DsessionRootDirectory=${session.rootDirectory}
+-Dapache.snapshots

compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java

@@ -310,7 +310,7 @@ protected DefaultRepositorySystemSession initRepoSession() throws Exception {
         DependencyTraverser depTraverser = new FatArtifactTraverser();
         session.setDependencyTraverser(depTraverser);
 
-        DependencyManager depManager = new ClassicDependencyManager(true, session.getScopeManager());
+        DependencyManager depManager = new ClassicDependencyManager(session.getScopeManager());
         session.setDependencyManager(depManager);
 
         DependencySelector depFilter = new AndDependencySelector(

compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java

@@ -43,6 +43,7 @@
 import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
 import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
 import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
@@ -95,7 +96,9 @@ protected DependencyManager getDependencyManager() {
     }
 
     public DependencyManager getDependencyManager(boolean transitive) {
-        return new ClassicDependencyManager(transitive, getScopeManager());
+        return transitive
+                ? new TransitiveDependencyManager(this.getScopeManager())
+                : new ClassicDependencyManager(this.scopeManager);
     }
 
     protected DependencySelector getDependencySelector() {

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java

@@ -93,10 +93,10 @@ void connectionProblems() throws Exception {
     void connectionProblemsPlugin() throws Exception {
         testit(
                 54312,
-                new String[] {
+                new String[] { // JDK "Connection to..." Apache "Connect to..."
                     ".*The following artifacts could not be resolved: org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 \\(absent\\): "
                             + "Could not transfer artifact org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 from/to "
-                            + "central \\(http://localhost:.*/repo\\): Connection to http://localhost:.*2/repo/ refused.*"
+                            + "central \\(http://localhost:.*/repo\\):.*Connect.*refused.*"
                 },
                 "pom-plugin.xml");
     }

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java

@@ -68,13 +68,40 @@ public void testitMNG3813() throws Exception {
 
         assertEquals("8", pclProps.getProperty(resName + ".count"));
 
-        assertTrue(pclProps.getProperty(resName + ".0").endsWith("/dep-a-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".1").endsWith("/dep-aa-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".2").endsWith("/dep-ac-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".3").endsWith("/dep-ab-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".4").endsWith("/dep-ad-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".5").endsWith("/dep-c-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".6").endsWith("/dep-b-0.1.jar!/" + resName));
-        assertTrue(pclProps.getProperty(resName + ".7").endsWith("/dep-d-0.1.jar!/" + resName));
+        // The following dependency section spans this dependency tree:
+        //   dep-a
+        //     dep-aa
+        //     dep-ac
+        //     dep-ab
+        //     dep-ad
+        //   dep-c
+        //   dep-b
+        //   dep-d
+        //
+        // Given this tree, the correct/expected class path using preOrder is:
+        //   dep-a, dep-aa, dep-ac, dep-ab, dep-ad, dep-c, dep-b, dep-d
+        // The correct/expected class path using levelOrder is:
+        //   dep-a, dep-c, dep-b, dep-d, dep-aa, dep-ac, dep-ab, dep-ad
+        if (matchesVersionRange("[,4.1.0-SNAPSHOT)")) {
+            // preOrder
+            assertTrue(pclProps.getProperty(resName + ".0").endsWith("/dep-a-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".1").endsWith("/dep-aa-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".2").endsWith("/dep-ac-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".3").endsWith("/dep-ab-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".4").endsWith("/dep-ad-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".5").endsWith("/dep-c-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".6").endsWith("/dep-b-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".7").endsWith("/dep-d-0.1.jar!/" + resName));
+        } else {
+            // levelOrder
+            assertTrue(pclProps.getProperty(resName + ".0").endsWith("/dep-a-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".1").endsWith("/dep-c-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".2").endsWith("/dep-b-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".3").endsWith("/dep-d-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".4").endsWith("/dep-aa-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".5").endsWith("/dep-ac-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".6").endsWith("/dep-ab-0.1.jar!/" + resName));
+            assertTrue(pclProps.getProperty(resName + ".7").endsWith("/dep-ad-0.1.jar!/" + resName));
+        }
     }
 }

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java

@@ -45,6 +45,9 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio
     private static final ArtifactVersion JDK_TRANSPORT_IN_MAVEN_SINCE =
             new DefaultArtifactVersion("4.0.0-alpha-9-SNAPSHOT");
 
+    private static final ArtifactVersion JDK_TRANSPORT_DEMOTED_IN_MAVEN_SINCE =
+            new DefaultArtifactVersion("4.1.0-SNAPSHOT");
+
     public MavenITmng7470ResolverTransportTest() {
         super("[3.9.0,)");
     }
@@ -125,11 +128,28 @@ private boolean isJdkTransportPresent() {
         return JDK_TRANSPORT_IN_MAVEN_SINCE.compareTo(getMavenVersion()) < 1;
     }
 
+    /**
+     * Returns {@code true} if JDK HttpClient transport is demoted in Maven (since 4.1.0-SNAPSHOT, the Resolver 2.0.12
+     * upgrade).
+     */
+    private boolean isJdkTransportDemoted() {
+        return JDK_TRANSPORT_DEMOTED_IN_MAVEN_SINCE.compareTo(getMavenVersion()) < 1;
+    }
+
     private String defaultLogSnippet() {
-        if (isJdkTransportUsable() && isJdkTransportPresent()) {
-            return JDK_LOG_SNIPPET;
+        if (!isJdkTransportPresent()) {
+            return APACHE_LOG_SNIPPET_OLD;
+        } else {
+            if (isJdkTransportUsable()) {
+                if (isJdkTransportDemoted()) {
+                    return APACHE_LOG_SNIPPET;
+                } else {
+                    return JDK_LOG_SNIPPET;
+                }
+            } else {
+                return APACHE_LOG_SNIPPET;
+            }
         }
-        return isJdkTransportPresent() ? APACHE_LOG_SNIPPET : APACHE_LOG_SNIPPET_OLD;
     }
 
     @Test

pom.xml

@@ -162,7 +162,7 @@ under the License.
     <plexusInterpolationVersion>1.28</plexusInterpolationVersion>
     <plexusTestingVersion>1.6.0</plexusTestingVersion>
     <plexusXmlVersion>4.1.0</plexusXmlVersion>
-    <resolverVersion>2.0.11</resolverVersion>
+    <resolverVersion>2.0.12-SNAPSHOT</resolverVersion>
     <securityDispatcherVersion>4.1.0</securityDispatcherVersion>
     <sisuVersion>0.9.0.M4</sisuVersion>
     <slf4jVersion>2.0.17</slf4jVersion>