Use Resolver API in go-offline for dependencies resolving (#1533)

* Use Resolver API in go-offline for dependencies resolving

- add assertions in IT test
- filters should be rewritten to Resolver API

* invoker 3.9.1

Author: slawekjaranowski

pom.xml

@@ -99,6 +99,9 @@ under the License.
     <plexus-archiver.version>4.10.1</plexus-archiver.version>
     <pluginTestingVersion>3.3.0</pluginTestingVersion>
 
+    <!-- TODO remove with next parent -->
+    <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
+
     <!-- strict check by dependency:analyze-only -->
     <enforce.dependency.declarations>true</enforce.dependency.declarations>
     <project.build.outputTimestamp>2024-10-18T18:16:14Z</project.build.outputTimestamp>

src/it/projects/go-offline/pom.xml

@@ -36,12 +36,24 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
+      <artifactId>maven-core</artifactId>
+      <version>3.9.11</version>
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.5.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>

src/it/projects/go-offline/test.properties

@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+File file = new File(basedir, 'build.log')
+assert file.exists()
+
+String buildLog = file.getText("UTF-8")
+
+assert buildLog.contains('[INFO] Resolved plugin: maven-clean-plugin-3.5.0.jar')
+assert buildLog.contains('[INFO] Resolved plugin dependency:')
+assert buildLog.contains('[INFO]       maven-clean-plugin-3.5.0.jar')
+assert buildLog.contains('[INFO]       plexus-utils-4.0.2.jar')
+
+assert buildLog.contains('[INFO] Resolved dependency: maven-core-3.9.11.jar')
+assert buildLog.contains('[INFO] Resolved dependency: maven-model-3.9.11.jar')
+assert buildLog.contains('[INFO] Resolved dependency: maven-settings-3.9.11.jar')
+
+

src/it/projects/go-offline/verify.groovy

@@ -20,57 +20,39 @@
 
 import java.util.List;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.artifact.filter.resolve.AbstractFilter;
-import org.apache.maven.shared.artifact.filter.resolve.Node;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * {@link TransformableFilter} implementation that excludes artifacts found in the Reactor.
+ * Filter implementation that excludes artifacts found in the Reactor.
  *
  * @author Maarten Mulders
  */
-public class ExcludeReactorProjectsDependencyFilter extends AbstractFilter {
-    private final Log log;
+public class ExcludeReactorProjectsDependencyFilter implements Predicate<Dependency> {
+    private final Logger log = LoggerFactory.getLogger(ExcludeReactorProjectsDependencyFilter.class);
     private final Set<String> reactorArtifactKeys;
 
-    public ExcludeReactorProjectsDependencyFilter(final List<MavenProject> reactorProjects, final Log log) {
-        this.log = log;
+    public ExcludeReactorProjectsDependencyFilter(final List<MavenProject> reactorProjects) {
         this.reactorArtifactKeys = reactorProjects.stream()
                 .map(project -> ArtifactUtils.key(project.getArtifact()))
                 .collect(Collectors.toSet());
     }
 
     @Override
-    public boolean accept(final Node node, final List<Node> parents) {
-        final Dependency dependency = node.getDependency();
-        if (dependency != null) {
-            final String dependencyArtifactKey =
-                    ArtifactUtils.key(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
-
-            final boolean result = isDependencyArtifactInReactor(dependencyArtifactKey);
-
-            if (log.isDebugEnabled() && result) {
-                log.debug("Skipped dependency " + dependencyArtifactKey + " because it is present in the reactor");
+    public boolean test(Dependency dependency) {
+        String key = ArtifactUtils.key(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
+        if (reactorArtifactKeys.contains(key)) {
+            if (log.isDebugEnabled()) {
+                log.debug("Skipped dependency {} because it is present in the reactor", key);
             }
-
-            return !result;
+            return false;
         }
         return true;
     }
-
-    private boolean isDependencyArtifactInReactor(final String dependencyArtifactKey) {
-        for (final String reactorArtifactKey : this.reactorArtifactKeys) {
-            // This check only includes GAV. Should we take a look at the types, too?
-            if (reactorArtifactKey.equals(dependencyArtifactKey)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }