From fb520e3040274c3176f77cf320ffc6cbbb22b697 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 6 Jun 2017 16:42:00 +0300
Subject: [PATCH] Maven: do not set JVM target to null

After a236400, it's expected that the value of jvmTarget should not be
null. Otherwise ArgumentUtils.convertArgumentsToStringList fails with
NPE
---
 .../java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 f0cfd189965..754cf244bf5 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
@@ -162,7 +162,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
             getLog().info("Optimization is turned off");
         }
 
-        arguments.jvmTarget = jvmTarget;
+        if (jvmTarget != null) {
+            arguments.jvmTarget = jvmTarget;
+        }
 
         if (jdkHome != null) {
             getLog().info("Overriding JDK home path with: " + jdkHome);