diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 050bfe78c5c..58979e707ac 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -61,7 +61,7 @@ org.jetbrains.kotlin:kotlin-maven-plugin:${project.version} org.jetbrains.kotlin:kotlin-maven-allopen:${project.version} org.jetbrains.kotlin:kotlin-maven-noarg:${project.version} - org.jetbrains.kotlin:kotlin-runtime:${project.version} + org.jetbrains.kotlin:kotlin-script-runtime:${project.version} org.jetbrains.kotlin:kotlin-stdlib:${project.version} org.jetbrains.kotlin:kotlin-stdlib-common:${project.version} org.jetbrains.kotlin:kotlin-stdlib-js:${project.version} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh index 957df3346fc..a5bb1f4ff23 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/verify.bsh @@ -1,4 +1,4 @@ source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] BUILD FAILURE"); -assertBuildLogHasLineThatContains("script threw an exception: exception from script"); \ No newline at end of file +assertBuildLogHasLineThatContains("exception from script"); \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/src/main/kotlin/org/jetbrains/kotlin/test/TestKotlinPluginRegistrar.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/src/main/kotlin/org/jetbrains/kotlin/test/TestKotlinPluginRegistrar.kt index 6da7b4afa7c..499c8b22d96 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/src/main/kotlin/org/jetbrains/kotlin/test/TestKotlinPluginRegistrar.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/src/main/kotlin/org/jetbrains/kotlin/test/TestKotlinPluginRegistrar.kt @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.compiler.plugin.* import org.jetbrains.kotlin.config.* object TestPluginKeys { - val TestOption = CompilerConfigurationKey.create("test option")!! + val TestOption = CompilerConfigurationKey.create("test option") } class TestCommandLineProcessor : CommandLineProcessor {