diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 4fb10b38029..1184f4dc215 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -44,13 +44,16 @@ maven-invoker-plugin - 1.5 + 1.9 src/it ${project.build.directory}/it */pom.xml + + ${project.version} + local-repo diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml index a1261774a19..34cbc8205b1 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-accessToInternal + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/verify.bsh index ce26d6e4491..b82dc15b969 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-accessToInternal-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-accessToInternal-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml index 0b5a4d289f2..1b107d16e9d 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-classpath + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/verify.bsh index cefedc661d0..299202f052b 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-classpath-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-classpath-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml index ce563ba20e2..2361a188e9a 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-executeKotlinScriptBuildAccess + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} execute-kotlin-script diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml index b01b587a098..e805ad46264 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-executeKotlinScriptCompileError + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} execute-kotlin-script diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml index ab1da4d9eb0..7d54237bae0 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-executeKotlinScriptFile + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} execute-kotlin-script diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml index 858daf6c0e5..6c1299cc2c4 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-executeKotlinScriptInline + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} execute-kotlin-script diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml index 2ab6a26b250..d44e3396f0a 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-executeKotlinScriptScriptException + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} execute-kotlin-script diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml index 1c6794a52d6..89fed0c33ad 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-extraArguments + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/verify.bsh index 8c770108b8e..6d687272392 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-extraArguments-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-extraArguments-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml index db536a48ea8..3888a23979c 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-helloworld + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/verify.bsh index 45e431b3265..11ef47ff8d7 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-helloworld-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-helloworld-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml index 3c9c8ecd5b2..4e8ec20c64d 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-js-extraArguments + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-js-library - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml index b7a91137c73..23a2678ba2f 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml @@ -4,20 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-js-suppressWarningsAndVersion + 1.0-SNAPSHOT org.jetbrains.kotlin kotlin-js-library - ${project.version} + ${kotlin.version} @@ -27,7 +22,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml index edaf623d0f8..7b588f00116 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-moduleName + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} customName diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/verify.bsh index a493c7fd788..ffa1bb2b0be 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-moduleName-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-moduleName-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml index 804f0b7bf6e..f0282b86a1d 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-moduleNameDefault + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/verify.bsh index bbb809de114..4f909ea1688 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-moduleNameDefault-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-moduleNameDefault-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/pom.xml index 053bd4273ce..dfda9ef42bf 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/pom.xml @@ -4,21 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-multimodule-root + 1.0-SNAPSHOT pom org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -32,7 +27,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/sub/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/sub/pom.xml index 4068df5d854..d1e999e4f1e 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/sub/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/sub/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin test-multimodule-root - 1.1-SNAPSHOT + 1.0-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/pom.xml index 053bd4273ce..dfda9ef42bf 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/pom.xml @@ -4,21 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-multimodule-root + 1.0-SNAPSHOT pom org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -32,7 +27,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/sub/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/sub/pom.xml index 3ff30febbf3..6748e0d126f 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/sub/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/sub/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin test-multimodule-root - 1.1-SNAPSHOT + 1.0-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/pom.xml index 053bd4273ce..dfda9ef42bf 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/pom.xml @@ -4,21 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-multimodule-root + 1.0-SNAPSHOT pom org.jetbrains.kotlin kotlin-stdlib - ${project.version} + ${kotlin.version} @@ -32,7 +27,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/sub/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/sub/pom.xml index e0288c812a6..4640c44cfac 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/sub/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/sub/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin test-multimodule-root - 1.1-SNAPSHOT + 1.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/pom.xml index 397fbab7fb2..846c97a341e 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-reflection + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-reflect - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/verify.bsh index be95b71d6ac..86fd8343773 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/verify.bsh @@ -1,7 +1,7 @@ import java.io.*; import java.net.*; -File file = new File(basedir, "target/test-reflection-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-reflection-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml index aeaf1028f43..be72b28df5c 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml @@ -4,14 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - + org.jetbrains.kotlin test-helloworld + 1.0-SNAPSHOT @@ -22,7 +17,7 @@ org.jetbrains.kotlin kotlin-runtime - ${project.version} + ${kotlin.version} @@ -51,7 +46,7 @@ kotlin-maven-plugin org.jetbrains.kotlin - ${project.version} + ${kotlin.version} compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/verify.bsh index 45e431b3265..11ef47ff8d7 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/verify.bsh @@ -1,6 +1,6 @@ import java.io.*; -File file = new File(basedir, "target/test-helloworld-1.1-SNAPSHOT.jar"); +File file = new File(basedir, "target/test-helloworld-1.0-SNAPSHOT.jar"); if (!file.exists() || !file.isFile()) { throw new FileNotFoundException("Could not find generated JAR: " + file); }