From 808a18a4e1ff4d53810347c773fcf84b87591bb9 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 20 Apr 2018 15:41:15 +0300 Subject: [PATCH] maven libraries: include dependencies with scope=runtime (IDEA-190400) --- .../idea/maven/aether/ArtifactRepositoryManager.java | 2 +- .../idea/maven/aether/ArtifactRepositoryManagerTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java b/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java index 88ea936de560..1c7f6b5dc622 100644 --- a/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java +++ b/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java @@ -177,7 +177,7 @@ public class ArtifactRepositoryManager { ); final ArtifactRequestBuilder builder = new ArtifactRequestBuilder(kind); collectResult.getRoot().accept(new TreeDependencyVisitor( - new FilteringDependencyVisitor(builder, DependencyFilterUtils.classpathFilter(JavaScopes.COMPILE)) + new FilteringDependencyVisitor(builder, DependencyFilterUtils.classpathFilter(JavaScopes.COMPILE, JavaScopes.RUNTIME)) )); requests = builder.getRequests(); } diff --git a/aether-dependency-resolver/testSrc/org/jetbrains/idea/maven/aether/ArtifactRepositoryManagerTest.java b/aether-dependency-resolver/testSrc/org/jetbrains/idea/maven/aether/ArtifactRepositoryManagerTest.java index 9cca3c7faf90..dc504b06f3c2 100644 --- a/aether-dependency-resolver/testSrc/org/jetbrains/idea/maven/aether/ArtifactRepositoryManagerTest.java +++ b/aether-dependency-resolver/testSrc/org/jetbrains/idea/maven/aether/ArtifactRepositoryManagerTest.java @@ -44,4 +44,9 @@ public class ArtifactRepositoryManagerTest extends UsefulTestCase { Collection files = myRepositoryManager.resolveDependency("junit", "junit", "4.12", false); assertSameElements(ContainerUtil.map(files, File::getName), "junit-4.12.jar"); } + + public void testResolveRuntimeDependencies() throws Exception { + Collection files = myRepositoryManager.resolveDependency("com.netflix.feign", "feign-jackson", "8.18.0", true); + assertContainsElements(ContainerUtil.map(files, File::getName), "feign-core-8.18.0.jar"); + } }