From 8e51f1aaddf68c7dab0295ff87859cdbdee1f0fd Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 24 Mar 2015 17:16:00 +0300
Subject: [PATCH] Idea moved to junit-4.12

---
 .idea/libraries/{junit_4_11.xml => junit_4_12.xml}          | 6 +++---
 eval4j/eval4j.iml                                           | 5 ++---
 .../jetbrains/kotlin/search/JUnitMembersSearcherTest.java   | 2 +-
 update_dependencies.xml                                     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename .idea/libraries/{junit_4_11.xml => junit_4_12.xml} (71%)

diff --git a/.idea/libraries/junit_4_11.xml b/.idea/libraries/junit_4_12.xml
similarity index 71%
rename from .idea/libraries/junit_4_11.xml
rename to .idea/libraries/junit_4_12.xml
index 91966bbbfdf..d571d6887ec 100644
--- a/.idea/libraries/junit_4_11.xml
+++ b/.idea/libraries/junit_4_12.xml
@@ -1,16 +1,16 @@
 <component name="libraryTable">
-  <library name="junit-4.11">
+  <library name="junit-4.12">
     <ANNOTATIONS>
       <root url="file://$PROJECT_DIR$/annotations" />
     </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/ideaSDK/lib/hamcrest-core-1.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.12.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-1.3-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/junit-4.11-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/junit-4.12-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/eval4j/eval4j.iml b/eval4j/eval4j.iml
index 61d8dd7ef7e..0555ab76d7b 100644
--- a/eval4j/eval4j.iml
+++ b/eval4j/eval4j.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
index c8a8a0b548e..22227947c47 100644
--- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
+++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public class JUnitMembersSearcherTest extends AbstractSearcherTest {
     private static final LightProjectDescriptor junitProjectDescriptor =
-            new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));
+            new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar"));
 
     public void testJunit3() throws IOException {
         doJUnit3test();
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 09dc44b92d6..327f736048e 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -218,7 +218,7 @@
         <!-- <get-asm-sources-and-rename-packages asm.version="5.0.1"/> -->
 
         <!-- Junit Sources -->
-        <get-maven-library prefix="junit" lib="junit" version="4.11" bin="false"/>
+        <get-maven-library prefix="junit" lib="junit" version="4.12" bin="false"/>
         <get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" bin="false"/>
 
         <!-- Protocol Buffers -->