Remove use of DependencyFilter (#337)

This causes a ClassNotFoundException when running with Maven out of the functional tests context.
graalvm · Oct 14, 2022 · 51baf9f · 51baf9f
1 parent fc6ded0
commit 51baf9f
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java
@@ -54,19 +54,17 @@
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyFilter;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.resolution.DependencyResult;
-import org.eclipse.aether.util.artifact.JavaScopes;
-import org.eclipse.aether.util.filter.DependencyFilterUtils;
 import org.graalvm.buildtools.VersionInfo;
 import org.graalvm.buildtools.maven.config.MetadataRepositoryConfiguration;
 import org.graalvm.buildtools.utils.FileUtils;
 import org.graalvm.reachability.DirectoryConfiguration;
 import org.graalvm.reachability.GraalVMReachabilityMetadataRepository;
 import org.graalvm.reachability.internal.FileSystemRepository;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -81,8 +79,6 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import javax.inject.Inject;
-
 import static org.graalvm.buildtools.utils.SharedConstants.METADATA_REPO_URL_TEMPLATE;
 
 /**
@@ -207,7 +203,6 @@ public void log(String groupId, String artifactId, String version, Supplier<Stri
  */
  private URL resolveDefaultMetadataRepositoryUrl() {
  RepositorySystemSession repositorySession = mavenSession.getRepositorySession();
- DependencyFilter classpathFilter = DependencyFilterUtils.classpathFilter(JavaScopes.RUNTIME);
  CollectRequest collectRequest = new CollectRequest();
  collectRequest.setRepositories(project.getRemoteProjectRepositories());
  Dependency repository = new Dependency(new DefaultArtifact(
@@ -220,7 +215,7 @@ private URL resolveDefaultMetadataRepositoryUrl() {
  collectRequest.addDependency(
  repository
  );
- DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, classpathFilter);
+ DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);
 
  DependencyResult dependencyResult = null;
  try {