diff --git a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java index d4e139e1b64..5b1b558272d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java @@ -30,7 +30,7 @@ public class JUnitUsageGenTest extends CodegenTestCase { @Override protected void setUp() throws Exception { super.setUp(); - File junitJar = new File("libraries/lib/junit-4.9.jar"); + File junitJar = new File("libraries/lib/junit-4.11.jar"); if (!junitJar.exists()) { throw new AssertionError("JUnit jar wasn't found"); diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java index 43d7f71df2b..44533c6bd9c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java @@ -86,7 +86,7 @@ public class TestlibTest extends UsefulTestCase { CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar()); - junitJar = new File("libraries/lib/junit-4.9.jar"); + junitJar = new File("libraries/lib/junit-4.11.jar"); assertTrue(junitJar.exists()); configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, junitJar); diff --git a/libraries/kunit/module.kt b/libraries/kunit/module.kt index 1e5a6b6154e..26b97121e63 100644 --- a/libraries/kunit/module.kt +++ b/libraries/kunit/module.kt @@ -3,7 +3,7 @@ import kotlin.modules.* fun project() { module("kunit") { // TODO how to refer to the dir of the module? - classpath += "lib/junit-4.9.jar" + classpath += "lib/junit-4.11.jar" addSourceFiles("src/main/kotlin") } diff --git a/libraries/lib/junit-4.11.jar b/libraries/lib/junit-4.11.jar new file mode 100644 index 00000000000..aaf74448492 Binary files /dev/null and b/libraries/lib/junit-4.11.jar differ diff --git a/libraries/lib/junit-4.9.jar b/libraries/lib/junit-4.9.jar deleted file mode 100644 index 14208156115..00000000000 Binary files a/libraries/lib/junit-4.9.jar and /dev/null differ diff --git a/libraries/stdlib/testModule.kt b/libraries/stdlib/testModule.kt index fcb1d44dc5e..5d6f1db5dc2 100644 --- a/libraries/stdlib/testModule.kt +++ b/libraries/stdlib/testModule.kt @@ -2,7 +2,7 @@ import kotlin.modules.* fun project() { module("testlib") { - classpath += "lib/junit-4.9.jar" + classpath += "lib/junit-4.11.jar" addSourceFiles("test") } diff --git a/libraries/tools/kdoc/ApiDocsModule.kt b/libraries/tools/kdoc/ApiDocsModule.kt index 90aa07b45c4..04c4dff936c 100644 --- a/libraries/tools/kdoc/ApiDocsModule.kt +++ b/libraries/tools/kdoc/ApiDocsModule.kt @@ -2,7 +2,7 @@ import kotlin.modules.* fun project() { module("apidocs") { - classpath += "../../lib/junit-4.9.jar" + classpath += "../../lib/junit-4.11.jar" addSourceFiles("../../stdlib/src") addSourceFiles("../../kunit/src/main/kotlin") diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt index e8574d1bbf1..ad58da3772f 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt @@ -25,7 +25,7 @@ class KDocTest { "-kotlin-home", "../../../dist/kotlinc", "-d", "target/classes-stdlib", "-no-stdlib", - "-classpath", "../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.9.jar", + "-classpath", "../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.11.jar", "../../stdlib/src", "../../kunit/src/main/kotlin", "../../kotlin-jdbc/src/main/kotlin" ) Assert.assertEquals(ExitCode.OK, r)