From 8d0eb207e330e86ce81dcd1043b527c03cc405a2 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 26 Apr 2017 22:19:03 +0300
Subject: [PATCH] Do not hardcode kotlin version in one of maven integration
 tests

---
 libraries/tools/kotlin-maven-plugin-test/pom.xml              | 3 +++
 .../kotlin-maven-plugin-test/src/it/test-plugins/expected.log | 4 ++--
 .../src/it/test-plugins/verify.groovy                         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml
index f0f2262ea70..03eebe9f511 100644
--- a/libraries/tools/kotlin-maven-plugin-test/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml
@@ -146,6 +146,9 @@
                             <postBuildHookScript>verify</postBuildHookScript>
                             <streamLogs>false</streamLogs>
                             <invokerPropertiesFile>invoker.properties</invokerPropertiesFile>
+                            <scriptVariables>
+                                <kotlinVersion>${project.version}</kotlinVersion>
+                            </scriptVariables>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log
index 9df2352dfd5..2d756030e90 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log
@@ -1,8 +1,8 @@
 [INFO] Kotlin Compiler version @snapshot@
 [INFO] Compiling Kotlin sources from [/test-extension/src/main/kotlin]
 [INFO] Module name is test-extension
-[WARNING] Some JAR files in the classpath have the Kotlin Runtime library bundled into them. This may cause difficult to debug problems if there's a different version @snapshot@ the Kotlin Runtime library in the classpath. Consider removing these libraries from the classpath or use '-Xskip-runtime-version-check' to suppress this warning
-[WARNING] /local-repo/org/jetbrains/kotlin/kotlin-compiler/1.1-SNAPSHOT/kotlin-compiler-1.1-SNAPSHOT.jar: (-1, -1) Library has Kotlin runtime bundled into it
+[WARNING] Some JAR files in the classpath have the Kotlin Runtime library bundled into them. This may cause difficult to debug problems if there's a different version of the Kotlin Runtime library in the classpath. Consider removing these libraries from the classpath or use '-Xskip-runtime-version-check' to suppress this warning
+[WARNING] /local-repo/org/jetbrains/kotlin/kotlin-compiler/@snapshot@/kotlin-compiler-@snapshot@.jar: (-1, -1) Library has Kotlin runtime bundled into it
 [INFO] Kotlin Compiler version @snapshot@
 [WARNING] No sources found skipping Kotlin compile
 [INFO] Kotlin Compiler version @snapshot@
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy
index ebf754989c0..867777c607f 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy
@@ -38,7 +38,7 @@ State state = buildLogFile.readLines().collect { it.replaceAll("\\u001b[^m]*m",
                 replaceAll(/[0-9]+\s*ms/, "LLL ms").
                 trim().
                 replaceAll(/^\[[A-Z]+\]$/, "").
-                replaceAll(/version [0-9a-z-+\.]+/, "version @snapshot@")
+                replace(kotlinVersion, "@snapshot@")
 
         if (filtered != "") {
             acc.lines << filtered