Bug 414645 : limit runtime-scoped dependencies visibility to test classpath

Change-Id: Id128d2a867968463d4a6bc8a35f93a6bdfc8ead8
Signed-off-by: Fred Bricon <fbricon@gmail.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DefaultClasspathManagerDelegate.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DefaultClasspathManagerDelegate.java
index 65f492fd..45d360eb 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DefaultClasspathManagerDelegate.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DefaultClasspathManagerDelegate.java
@@ -126,10 +126,10 @@ public class DefaultClasspathManagerDelegate implements IClasspathManagerDelegat
         entry = classpath.addProjectEntry(projectPath);
         ProjectTestAttributes testAttributes = projectTestAttributes.get(projectPath);
         if(testAttributes == null) {
-          testAttributes = new ProjectTestAttributes(isTestScope(a), !isTestArtifact(a));
+          testAttributes = new ProjectTestAttributes(isOnlyVisibleByTests(a), !isTestArtifact(a));
           projectTestAttributes.put(projectPath, testAttributes);
         } else {
-          testAttributes.isTest &= isTestScope(a);
+          testAttributes.isTest &= isOnlyVisibleByTests(a);
           testAttributes.excludeTestSources &= !isTestArtifact(a);
         }
 
@@ -137,7 +137,7 @@ public class DefaultClasspathManagerDelegate implements IClasspathManagerDelegat
         File artifactFile = a.getFile();
         if(artifactFile != null /*&& artifactFile.canRead()*/) {
           entry = classpath.addLibraryEntry(Path.fromOSString(artifactFile.getAbsolutePath()));
-          entry.setClasspathAttribute(IClasspathManager.TEST_ATTRIBUTE, isTestScope(a) ? "true" : null);
+          entry.setClasspathAttribute(IClasspathManager.TEST_ATTRIBUTE, isOnlyVisibleByTests(a) ? "true" : null);
         }
       }
 
@@ -158,8 +158,8 @@ public class DefaultClasspathManagerDelegate implements IClasspathManagerDelegat
     });
   }
 
-  private boolean isTestScope(Artifact a) {
-    return Artifact.SCOPE_TEST.equals(a.getScope());
+  private boolean isOnlyVisibleByTests(Artifact a) {
+    return Artifact.SCOPE_TEST.equals(a.getScope()) || Artifact.SCOPE_RUNTIME.equals(a.getScope());
   }
 
   private boolean isTestArtifact(Artifact a) {