commit 43f88bd57d07628e72239b331228d2836865bba3
author Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Thu Nov 17 11:31:58 2022 +0100
committer Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Mon Nov 21 14:34:35 2022 +0100
tree b9ae15f8d9cdcf873bd4e6501ac4d0b0b680b495
parent 1d76bce3dda73b916cdcc3cc3f0502c60dee6cbd

Suppress warning for mvn+kapt+jdk9

Suppress the warning about lack of tools.jar, as this jar does not present in JDK9+

#KT-47110 Fixed

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java

diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java
index d91df11..6cfdf53 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java
@@ -40,7 +40,9 @@
 import static org.jetbrains.kotlin.maven.Util.joinArrays;
 import static org.jetbrains.kotlin.maven.kapt.AnnotationProcessingManager.*;
 
-/** @noinspection UnusedDeclaration */
+/**
+ * @noinspection UnusedDeclaration
+ */
 @Mojo(name = "kapt", defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE)
 public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
     @Parameter
@@ -72,7 +74,7 @@
     @Component
     private ArtifactHandlerManager artifactHandlerManager;
 
-    @Parameter( defaultValue = "${session}", readonly = true, required = true )
+    @Parameter(defaultValue = "${session}", readonly = true, required = true)
     private MavenSession session;
 
     @Component
@@ -194,8 +196,7 @@
 
         try {
             resolvedArtifacts = getAnnotationProcessingManager().resolveAnnotationProcessors(annotationProcessorPaths);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw new MojoExecutionException("Error while processing kapt options", e);
         }
 
@@ -220,6 +221,18 @@
             getLog().warn("Can't determine Java home, 'java.home' property does not exist");
             return null;
         }
+
+        String jdkStringVersion = System.getProperty("java.specification.version");
+        if (jdkStringVersion == null) return null;
+        int jdkVersion;
+        try {
+            jdkVersion = Integer.parseInt(jdkStringVersion);
+        } catch (NumberFormatException e) {
+            // we got 1.8 or 1.6
+            jdkVersion = 0;
+        }
+        if (jdkVersion >= 9) return null;
+
         File javaHome = new File(javaHomePath);
         File toolsJar = new File(javaHome, "lib/tools.jar");
         if (toolsJar.exists()) {
@@ -302,8 +315,7 @@
             int equalsIndex = option.indexOf("=");
             if (equalsIndex < 0) {
                 map.put(option, "");
-            }
-            else {
+            } else {
                 map.put(option.substring(0, equalsIndex).trim(), option.substring(equalsIndex + 1).trim());
             }
         }