changed scope to 'test' for dependencies on junit

diff --git a/RegExpSupport/regexp-lang.iml b/RegExpSupport/regexp-lang.iml
index 63cbce838a78c9d89beff434ec2480623cb49812..0d900fb73b4171ce957b16dcc2430cae6b07a85b 100644 (file)
--- a/RegExpSupport/regexp-lang.iml
+++ b/RegExpSupport/regexp-lang.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
   <component name="RetroweaverPlugin">
     <setting name="active" value="false" />

diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 262ae95b66244362aba658f8cd5e610bc226b91e..c52f97bf075df2fb71a27d32c802dab8a3cfe91b 100644 (file)
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -28,7 +28,7 @@
     <orderEntry type="library" name="jcip" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java b/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java
index 01c0784385d7a00e761a9381f3010d054ac1baf6..32d61a83f8b68cea52c8b45a86395997531d91ea 100644 (file)
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java
@@ -33,9 +33,14 @@ public class JavaSdkUtil {
     }
   }
 
-  
+
   public static String getJunit4JarPath() {
-    return PathUtil.getJarPathForClass(org.junit.Test.class);
+    try {
+      return PathUtil.getJarPathForClass(Class.forName("org.junit.Test"));
+    }
+    catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   public static String getJunit3JarPath() {

diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index 51baca32eb85f24acd877384d5c5afc100cc0463..d9b23a58fd36d5a8488706b0c987765c5895dff3 100644 (file)
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="forms_rt" />
     <orderEntry type="library" name="Trove4j" level="project" />

diff --git a/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml b/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml
index 73c87c58a2dd6e545b37f81825fa1799fff199dc..84ce8cb03cbb414b469b0bd01505f072032f0c8b 100644 (file)
--- a/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml
+++ b/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
   </component>

diff --git a/plugins/android/android.iml b/plugins/android/android.iml
index 6ebec214ae24ead254b6e0e0459b462f316ecac3..8e4baf5b45ba86e5cc5b0f814dcb100ce58c466b 100644 (file)
--- a/plugins/android/android.iml
+++ b/plugins/android/android.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="library" name="JUnit3" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="execution-impl" />
     <orderEntry type="module" module-name="dom-impl" />
     <orderEntry type="module" module-name="compiler-impl" />

diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index d6d1bf536facd5d50c91af3304f71e88a453562a..3ff75610bb1fb7cb049c597e9ccb64b092263456 100644 (file)
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" exported="" name="Ant" level="project" />
     <orderEntry type="module" module-name="compiler-impl" />
     <orderEntry type="module" module-name="java-runtime" />

diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml
index ebf1588a452a5997132c3ffd9006111f9914a332..979e9c649f35f505e2e1bf1f854ae7a6008a7aad 100644 (file)
--- a/plugins/svn4idea/svn4idea.iml
+++ b/plugins/svn4idea/svn4idea.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="module" module-name="vcs-api" />
     <orderEntry type="module" module-name="platform-api" />

diff --git a/plugins/tasks/jira-connector/jira-connector.iml b/plugins/tasks/jira-connector/jira-connector.iml
index 0a2bfc5b8111f2e4399ae1229bed34b4b7ef5d9a..eb8741d1e6ebe686e5a061561b82f2148f34beb6 100644 (file)
--- a/plugins/tasks/jira-connector/jira-connector.iml
+++ b/plugins/tasks/jira-connector/jira-connector.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="module" module-name="tasks-api" />
     <orderEntry type="module" module-name="tasks-core" />