From 6de0d79a7898332163bb5e4cb7c59c6ef811bd83 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Thu, 23 Mar 2017 12:52:49 +0300
Subject: [PATCH] KT-16743 Update configuration options in Kotlin Maven plugin
 deprecate parameters module and testModule

---
 .../org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java     | 4 ++--
 .../org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java     | 1 -
 .../org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java  | 1 -
 .../java/org/jetbrains/kotlin/maven/TestMetadataMojo.java     | 1 -
 .../jetbrains/kotlin/maven/kapt/KaptTestJvmCompilerMojo.java  | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
index c2c3e004a19..fc65a50086c 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
@@ -155,14 +155,14 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
     /**
      * Kotlin compilation module, as alternative to source files or folders.
      */
-    @Parameter
+    @Parameter(readonly = true)
     @Deprecated
     public String module;
 
     /**
      * Kotlin compilation module, as alternative to source files or folders (for tests).
      */
-    @Parameter
+    @Parameter(readonly = true)
     @Deprecated
     public String testModule;
 
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java
index 692e87d9be0..1b1dc02e728 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java
@@ -90,7 +90,6 @@ public class KotlinTestCompileMojo extends K2JVMCompileMojo {
 
     @Override
     protected void configureSpecificCompilerArguments(@NotNull K2JVMCompilerArguments arguments) throws MojoExecutionException {
-        module = testModule;
         classpath = testClasspath;
         arguments.friendPaths = new String[] { output };
         output = testOutput;
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java
index ecbfa6991c2..9471912160e 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java
@@ -78,7 +78,6 @@ public class KotlinTestJSCompilerMojo extends K2JSCompilerMojo {
 
     @Override
     protected void configureSpecificCompilerArguments(@NotNull K2JSCompilerArguments arguments) throws MojoExecutionException {
-        module = testModule;
         output = testOutput;
 
         super.configureSpecificCompilerArguments(arguments);
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/TestMetadataMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/TestMetadataMojo.java
index cb9ee9b4f48..f1108a21c46 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/TestMetadataMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/TestMetadataMojo.java
@@ -26,7 +26,6 @@ public class TestMetadataMojo extends MetadataMojo {
     protected void configureSpecificCompilerArguments(@NotNull K2MetadataCompilerArguments arguments) throws MojoExecutionException {
         String productionOutput = output;
 
-        module = testModule;
         classpath = testClasspath;
 //        arguments.friendPaths = new String[] { productionOutput };
         output = testOutput;
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptTestJvmCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptTestJvmCompilerMojo.java
index 13eb61255d6..058b8e264dc 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptTestJvmCompilerMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptTestJvmCompilerMojo.java
@@ -65,7 +65,6 @@ public class KaptTestJvmCompilerMojo extends KaptJVMCompilerMojo {
 
     @Override
     protected void configureSpecificCompilerArguments(@NotNull K2JVMCompilerArguments arguments) throws MojoExecutionException {
-        module = testModule;
         classpath = testClasspath;
         arguments.friendPaths = new String[] { output };
         output = testOutput;