Feat: Apply latest Resolver 2.0.19 changes

maven-core/pom.xml

@@ -94,6 +94,10 @@ under the License.
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-supplier-mvn3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>

maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java

@@ -39,7 +39,6 @@
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.internal.RepositorySystemSessionFactory;
 import org.apache.maven.model.ModelBase;
-import org.apache.maven.repository.internal.MavenSessionBuilderSupplier;
 import org.apache.maven.rtinfo.RuntimeInformation;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
@@ -62,6 +61,7 @@
 import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.resolution.ResolutionErrorPolicy;
+import org.eclipse.aether.supplier.SessionBuilderSupplier;
 import org.eclipse.aether.util.ConfigUtils;
 import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
 import org.eclipse.aether.util.listener.ChainedRepositoryListener;
@@ -213,7 +213,7 @@ public RepositorySystemSession.SessionBuilder newRepositorySessionBuilder(MavenE
         configProps.putAll(request.getSystemProperties());
         configProps.putAll(request.getUserProperties());
 
-        RepositorySystemSession.SessionBuilder mainSessionBuilder = new MavenSessionBuilderSupplier(repoSystem).get();
+        RepositorySystemSession.SessionBuilder mainSessionBuilder = new SessionBuilderSupplier(repoSystem).get();
         mainSessionBuilder.setCache(request.getRepositoryCache());
 
         mainSessionBuilder.setOffline(request.isOffline());
@@ -269,7 +269,7 @@ public RepositorySystemSession.SessionBuilder newRepositorySessionBuilder(MavenE
 
         versionFilterBuilder
                 .buildVersionFilter((String) configProps.get(MAVEN_VERSION_FILTER), this::parseVersionConstraint)
-                .map(mainSessionBuilder::setVersionFilter);
+                .ifPresent(mainSessionBuilder::setVersionFilter);
 
         boolean dependencyManagerTransitivity =
                 ConfigUtils.getBoolean(configProps, false, MAVEN_RESOLVER_DEPENDENCY_MANAGER_TRANSITIVITY);

maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java

@@ -42,6 +42,7 @@
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionChecker;
 import org.eclipse.aether.collection.DependencyCollectionException;
 import org.eclipse.aether.collection.DependencySelector;
 import org.eclipse.aether.collection.VersionFilterBuilder;
@@ -197,6 +198,8 @@ private DependencyNode resolveInternal(
 
             DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession(session);
             pluginSession.setConfigProperty(VersionFilterBuilder.VERSION_FILTER_SUPPRESSED, Boolean.TRUE.toString());
+            pluginSession.setConfigProperty(
+                    DependencyCollectionChecker.COLLECTOR_CHECKER_SUPPRESSED, Boolean.TRUE.toString());
             pluginSession.setDependencySelector(selector);
             pluginSession.setDependencyGraphTransformer(session.getDependencyGraphTransformer());
 

maven-resolver-provider/pom.xml

@@ -67,12 +67,6 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-supplier-mvn3</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

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

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.repository.internal;
+
+import org.apache.maven.model.Model;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.resolution.ArtifactDescriptorResult;
+
+/**
+ * Extension point in Maven.
+ *
+ * @since 3.10.0
+ */
+public interface ArtifactDescriptorDecorator {
+
+    /**
+     * Method that has access to session, result and model.
+     */
+    void populateArtifactDescriptor(RepositorySystemSession session, ArtifactDescriptorResult result, Model model);
+}

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

@@ -22,6 +22,7 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -95,13 +96,18 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
 
     private ModelCacheFactory modelCacheFactory;
 
-    private Map<String, MavenArtifactRelocationSource> artifactRelocationSources;
+    private Map<String, MavenArtifactRelocationSource> artifactRelocationSources = Collections.emptyMap();
+
+    private Map<String, ArtifactDescriptorDecorator> artifactDescriptorDecorators = Collections.emptyMap();
 
     private final ArtifactDescriptorReaderDelegate artifactDescriptorReaderDelegate =
             new ArtifactDescriptorReaderDelegate();
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
+    /**
+     * Just here for "static" resolver providers.
+     */
     @Deprecated
     public DefaultArtifactDescriptorReader() {
         // enable no-arg constructor
@@ -135,8 +141,11 @@ public DefaultArtifactDescriptorReader(
         setArtifactRelocationSources(artifactRelocationSources);
     }
 
+    /**
+     * Just here for "static" resolver providers.
+     */
     @SuppressWarnings("checkstyle:parameternumber")
-    @Inject
+    @Deprecated
     public DefaultArtifactDescriptorReader(
             RemoteRepositoryManager remoteRepositoryManager,
             VersionResolver versionResolver,
@@ -156,6 +165,29 @@ public DefaultArtifactDescriptorReader(
         setArtifactRelocationSources(artifactRelocationSources);
     }
 
+    @SuppressWarnings("checkstyle:parameternumber")
+    @Inject
+    public DefaultArtifactDescriptorReader(
+            RemoteRepositoryManager remoteRepositoryManager,
+            VersionResolver versionResolver,
+            VersionRangeResolver versionRangeResolver,
+            ArtifactResolver artifactResolver,
+            ModelBuilder modelBuilder,
+            RepositoryEventDispatcher repositoryEventDispatcher,
+            ModelCacheFactory modelCacheFactory,
+            Map<String, MavenArtifactRelocationSource> artifactRelocationSources,
+            Map<String, ArtifactDescriptorDecorator> artifactDescriptorDecorators) {
+        setRemoteRepositoryManager(remoteRepositoryManager);
+        setVersionResolver(versionResolver);
+        setVersionRangeResolver(versionRangeResolver);
+        setArtifactResolver(artifactResolver);
+        setModelBuilder(modelBuilder);
+        setRepositoryEventDispatcher(repositoryEventDispatcher);
+        setModelCacheFactory(modelCacheFactory);
+        setArtifactRelocationSources(artifactRelocationSources);
+        setArtifactDescriptorDecorators(artifactDescriptorDecorators);
+    }
+
     @Deprecated
     public void initService(ServiceLocator locator) {
         setRemoteRepositoryManager(locator.getService(RemoteRepositoryManager.class));
@@ -216,6 +248,13 @@ public DefaultArtifactDescriptorReader setArtifactRelocationSources(
         return this;
     }
 
+    public DefaultArtifactDescriptorReader setArtifactDescriptorDecorators(
+            Map<String, ArtifactDescriptorDecorator> artifactDescriptorDecorators) {
+        this.artifactDescriptorDecorators =
+                Objects.requireNonNull(artifactDescriptorDecorators, "artifactDescriptorDecorators cannot be null");
+        return this;
+    }
+
     @Override
     public ArtifactDescriptorResult readArtifactDescriptor(
             RepositorySystemSession session, ArtifactDescriptorRequest request) throws ArtifactDescriptorException {
@@ -232,6 +271,10 @@ public ArtifactDescriptorResult readArtifactDescriptor(
             }
 
             delegate.populateResult(session, result, model);
+
+            for (ArtifactDescriptorDecorator decorator : artifactDescriptorDecorators.values()) {
+                decorator.populateArtifactDescriptor(session, result, model);
+            }
         }
 
         return result;