From 6eae036c7956c616469cb3dabffeaebe0021ded6 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 20 Dec 2018 13:51:13 +0300
Subject: [PATCH] IDEA project configuration: use JUnit3 library with 'Test'
 scope only

The library isn't used by the IDE, it's kept only for compatibility with users' projects, so switching dependency scope helps to avoid messages about conflicting library versions (see IDEA-204495).
---
 .../org/jetbrains/intellij/build/BaseIdeaProperties.groovy      | 1 +
 plugins/junit/intellij.junit.iml                                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
index 001fbf65bdde..5f1de0693379 100644
--- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
@@ -125,6 +125,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
         withoutProjectLibrary("Ant")
         withoutProjectLibrary("Gradle")
         removeVersionFromProjectLibraryJarNames("jetbrains-annotations")
+        withProjectLibrary("JUnit3")
         removeVersionFromProjectLibraryJarNames("JUnit3") //for compatibility with users projects which refer to IDEA_HOME/lib/junit.jar
       }
     } as Consumer<PlatformLayout>
diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml
index 22841103ebd5..f2af499bedf5 100644
--- a/plugins/junit/intellij.junit.iml
+++ b/plugins/junit/intellij.junit.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
     <orderEntry type="module" module-name="intellij.java.rt" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
-    <orderEntry type="library" name="JUnit3" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.junit.rt" />
     <orderEntry type="module" module-name="intellij.java.compiler" />