From 0eb5bf21e929fac26d7a777dd68085b3af410e9a Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 6 Sep 2018 18:03:32 +0300
Subject: [PATCH] Fix maven plugin smoke test

- Do not use default encoding to avoid warnings in logs
- Update 'Downloading'/'Downloaded' filters to new maven version
---
 libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml     | 4 ++++
 .../tools/kotlin-maven-plugin/src/it/simple/verify.groovy     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml b/libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml
index bbae1261542..2d948ed5dcd 100644
--- a/libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml
@@ -9,6 +9,10 @@
     <artifactId>test-project</artifactId>
     <version>1.0</version>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy b/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy
index 121c46f3e5f..7303781850d 100644
--- a/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy
+++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy
@@ -23,8 +23,8 @@ State state = new File(basedir, "build.log").readLines().collect { it.replaceAll
     def m = pattern.matcher(line)
     if (m.find()) {
         acc.currentPlugin = m.group(1)
-    } else if (line.startsWith("[INFO] Downloaded:") ||
-               line.startsWith("[INFO] Downloading:") ||
+    } else if (line.startsWith("[INFO] Downloaded") ||
+               line.startsWith("[INFO] Downloading") ||
                line.startsWith("Downloaded:") ||
                line.startsWith("Downloading:") ||
                line.startsWith("[INFO] PERF:")) {