From a54e49aeddcf3f01d2fb5451f2c9e503927710c3 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 9 Oct 2015 12:43:00 +0200 Subject: [PATCH] Maven build fixed --- .../tools/kotlin-maven-plugin/src/it/simple/expected.log | 1 - .../org/jetbrains/kotlin/maven/K2JVMCompileMojo.java | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log index 572408bac7c..45bd68b2e60 100644 --- a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log +++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log @@ -1,5 +1,4 @@ [INFO] Kotlin Compiler version @snapshot@ [INFO] Compiling Kotlin sources from [/src/main/kotlin] [INFO] Classes directory is /target/classes -[INFO] Using kotlin annotations from /local-repo/org/jetbrains/kotlin/kotlin-jdk-annotations/0.1-SNAPSHOT/kotlin-jdk-annotations-0.1-SNAPSHOT.jar [INFO] Module name is test-project diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java index 67b80af01b7..634e8389575 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java @@ -111,4 +111,13 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase filterClassPath(List classpath) { + return CollectionsKt.filter(classpath, new Function1() { + @Override + public Boolean invoke(String s) { + return new File(s).exists() || new File(project.getBasedir(), s).exists(); + } + }); + } }