From 1157e052eeaa801794df5ba0b568eb1c296bba75 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 20 Jun 2016 23:04:30 +0300
Subject: [PATCH] Maven: support languageVersion parameter, linked to property
 kotlin.compiler.languageVersion.

---
 .../src/it/test-languageVersion/pom.xml                | 10 ++++------
 .../org/jetbrains/kotlin/maven/K2JVMCompileMojo.java   |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml
index 617b0a1f02b..5da0f97072e 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml
@@ -21,6 +21,10 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <kotlin.compiler.languageVersion>1.0</kotlin.compiler.languageVersion>
+    </properties>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -56,12 +60,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <args>
-                        <arg>-language-version</arg>
-                        <arg>1.0</arg>
-                    </args>
-                </configuration>
             </plugin>
         </plugins>
     </build>
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 54bf49ceec0..ab1afc54c6f 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
@@ -61,6 +61,9 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
     @Parameter(defaultValue = "${project.artifactId}-test", required = true, readonly = true)
     protected String testModuleName;
 
+    @Parameter(property = "kotlin.compiler.languageVersion", required = false, readonly = false)
+    protected String languageVersion;
+
     @Parameter(property = "kotlin.compiler.jvmTarget", required = false, readonly = false)
     protected String jvmTarget;
 
@@ -106,6 +109,7 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
             getLog().info("Optimization is turned off");
         }
 
+        arguments.languageVersion = languageVersion;
         arguments.jvmTarget = jvmTarget;
     }
 }