diff --git a/.idea/libraries/JUnit4.xml b/.idea/libraries/JUnit4.xml index 93d4c1c42f40..a5128f8706bb 100644 --- a/.idea/libraries/JUnit4.xml +++ b/.idea/libraries/JUnit4.xml @@ -2,12 +2,12 @@ - + - + diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar deleted file mode 100644 index aaf744484929..000000000000 Binary files a/lib/junit-4.11.jar and /dev/null differ diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar new file mode 100644 index 000000000000..3a7fc266c3e3 Binary files /dev/null and b/lib/junit-4.12.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index ba47ed3e52d1..c452a9e3d4f3 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -39,7 +39,7 @@ jsch.agentproxy.usocket-jna.jar jsch.agentproxy.usocket-nc.jar jsr166e.jar jsr173_1.0_api.jar -junit-4.11.jar +junit-4.12.jar junit.jar jzlib-1.1.1.jar log4j.jar diff --git a/lib/src/junit-4.11-src.jar b/lib/src/junit-4.11-src.jar deleted file mode 100644 index 80801569a5b2..000000000000 Binary files a/lib/src/junit-4.11-src.jar and /dev/null differ diff --git a/lib/src/junit-4.12-sources.jar b/lib/src/junit-4.12-sources.jar new file mode 100644 index 000000000000..884f92f595c9 Binary files /dev/null and b/lib/src/junit-4.12-sources.jar differ diff --git a/plugins/eclipse/testData/iml/allProps/expected/expected.iml b/plugins/eclipse/testData/iml/allProps/expected/expected.iml index d47060bab059..73c02983b9bd 100644 --- a/plugins/eclipse/testData/iml/allProps/expected/expected.iml +++ b/plugins/eclipse/testData/iml/allProps/expected/expected.iml @@ -101,7 +101,7 @@ - + diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java index 4bb2508c9db5..174f72719e05 100644 --- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java +++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java @@ -55,7 +55,7 @@ public class ModelBuildScriptClasspathBuilderImplTest extends AbstractModelBuild assertNotNull(classpathModel); assertEquals(3, classpathModel.getClasspath().size()); - assertEquals("junit-4.11.jar", new File(classpathModel.getClasspath().getAt(0).getClasses().iterator().next()).getName()); + assertEquals("junit-4.12.jar", new File(classpathModel.getClasspath().getAt(0).getClasses().iterator().next()).getName()); assertEquals("hamcrest-core-1.3.jar", new File(classpathModel.getClasspath().getAt(1).getClasses().iterator().next()).getName()); assertEquals("someDep.jar", new File(classpathModel.getClasspath().getAt(2).getClasses().iterator().next()).getName()); } @@ -64,7 +64,7 @@ public class ModelBuildScriptClasspathBuilderImplTest extends AbstractModelBuild assertNotNull("Null build classpath for module: " + module.getName(), classpathModel); assertEquals("Wrong build classpath for module: " + module.getName(), 3, classpathModel.getClasspath().size()); - assertEquals("Wrong build classpath for module: " + module.getName(), "junit-4.11.jar", + assertEquals("Wrong build classpath for module: " + module.getName(), "junit-4.12.jar", new File(classpathModel.getClasspath().getAt(0).getClasses().iterator().next()).getName()); assertEquals("Wrong build classpath for module: " + module.getName(), "hamcrest-core-1.3.jar", new File(classpathModel.getClasspath().getAt(1).getClasses().iterator().next()).getName()); diff --git a/plugins/java-decompiler/engine/build.xml b/plugins/java-decompiler/engine/build.xml index 6ed39f0a45cc..9f4c208818d2 100644 --- a/plugins/java-decompiler/engine/build.xml +++ b/plugins/java-decompiler/engine/build.xml @@ -11,7 +11,7 @@ - +