Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove use of DependencyFilter #337

Merged
merged 1 commit into from
Oct 14, 2022
Merged

Remove use of DependencyFilter #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -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(
Expand All @@ -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 {
Expand Down