Added toolchin support for devmode, compiler plugin. Also enabled jdkToolchain for testing

Author: Sajeer

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java

@@ -43,6 +43,7 @@
 
 import io.openliberty.tools.common.plugins.util.LibertyPropFilesUtility;
 import io.openliberty.tools.maven.utils.CommonLogger;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.execution.MavenSession;
@@ -520,7 +521,16 @@ public ServerTask getServerTask() throws Exception {
 
                     // set environment variables for server start task
                     serverTask.setOperation("debug");
-                    serverTask.setEnvironmentVariables(getDebugEnvironmentVariables());
+
+                    // Merge toolchain environment with debug environment
+                    Map<String, String> debugEnv = getDebugEnvironmentVariables();
+                    if (toolchain != null) {
+                        String toolchainJavaHome = getJdkHomeFromToolchain(toolchain);
+                        if (toolchainJavaHome != null) {
+                            debugEnv.put("JAVA_HOME", toolchainJavaHome);
+                        }
+                    }
+                    serverTask.setEnvironmentVariables(debugEnv);
                 } else {
                     serverTask.setOperation("run");
                 }
@@ -1740,24 +1750,67 @@ private JavaCompilerOptions getMavenCompilerOptions(MavenProject currentProject)
         String release = getCompilerOption(configuration, "release", "maven.compiler.release", currentProject);
         String source = getCompilerOption(configuration, "source", "maven.compiler.source", currentProject);
         String target = getCompilerOption(configuration, "target", "maven.compiler.target", currentProject);
+
+        // Fetch the toolchain version configured for the project
+        String jdkToolchainVersion = jdkToolchain != null ? jdkToolchain.get("version") : null;
+        if (StringUtils.isNotEmpty(jdkToolchainVersion)) {
+            String compilerJdkToolchainVersion = null;
+            if (configuration != null) {
+                Xpp3Dom compilerJdkToolchain = configuration.getChild("jdkToolchain");
+                if (compilerJdkToolchain != null) {
+                    Xpp3Dom versionChild = compilerJdkToolchain.getChild("version");
+                    if (versionChild != null) {
+                        compilerJdkToolchainVersion = StringUtils.trimToNull(versionChild.getValue());
+                    }
+                }
+            }
+
+            if (compilerJdkToolchainVersion == null) {
+                getLog().debug("Maven compiler plugin is not configured with a jdkToolchain. "
+                        + "Using liberty-maven-plugin jdkToolchain configuration for Java compiler options.");
+            } else {
+                if (jdkToolchainVersion.equals(compilerJdkToolchainVersion)) {
+                    getLog().info("Liberty Maven Plugin jdkToolchain configuration matches the Maven Compiler Plugin jdkToolchain "
+                            + "configuration: version " + jdkToolchainVersion + ".");
+                } else {
+                    getLog().debug("Liberty Maven Plugin jdkToolchain configuration (version " + jdkToolchainVersion
+                            + ") does not match the Maven Compiler Plugin jdkToolchain configuration "
+                            + "(version " + compilerJdkToolchainVersion
+                            + "). The project-level Maven Compiler Plugin toolchain configuration will be used for compilation.");
+                }
+            }
+        }
+
         if (release != null) {
-            getLog().debug("Setting compiler release to " + release);
+            if (StringUtils.isNotEmpty(jdkToolchainVersion)) {
+                getLog().debug("Setting compiler release to toolchain JDK version " + jdkToolchainVersion);
+            } else {
+                getLog().debug("Setting compiler release to " + release);
+            }
             if (source != null) {
                 getLog().debug("Compiler option source will be ignored since release is specified");
             }
             if (target != null) {
                 getLog().debug("Compiler option target will be ignored since release is specified");
             }
-            compilerOptions.setRelease(release);
+            compilerOptions.setRelease(StringUtils.isNotEmpty(jdkToolchainVersion) ? jdkToolchainVersion : release);
         } else {
             // add source and target only if release is not set
             if (source != null) {
-                getLog().debug("Setting compiler source to " + source);
-                compilerOptions.setSource(source);
+                if (StringUtils.isNotEmpty(jdkToolchainVersion)) {
+                    getLog().debug("Setting compiler source to toolchain JDK version " + jdkToolchainVersion);
+                } else {
+                    getLog().debug("Setting compiler source to " + source);
+                }
+                compilerOptions.setSource(StringUtils.isNotEmpty(jdkToolchainVersion) ? jdkToolchainVersion : source);
             }
             if (target != null) {
-                getLog().debug("Setting compiler target to " + target);
-                compilerOptions.setTarget(target);
+                if (StringUtils.isNotEmpty(jdkToolchainVersion)) {
+                    getLog().debug("Setting compiler target to toolchain JDK version " + jdkToolchainVersion);
+                } else {
+                    getLog().debug("Setting compiler target to " + target);
+                }
+                compilerOptions.setTarget(StringUtils.isNotEmpty(jdkToolchainVersion) ? jdkToolchainVersion : target);
             }
         }
 

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/utils/ExecuteMojoUtil.java

@@ -98,7 +98,7 @@ public class ExecuteMojoUtil {
             "testFailureIgnore", "testNGArtifactName", "threadCount", "threadCountClasses",
             "threadCountMethods", "threadCountSuites", "trimStackTrace", "useFile",
             "useManifestOnlyJar", "useModulePath", "useSystemClassLoader",
-            "useUnlimitedThreads", "workingDirectory"
+            "useUnlimitedThreads", "workingDirectory", "jdkToolchain"
     ));
 
     // https://maven.apache.org/surefire/maven-failsafe-plugin/integration-test-mojo.html
@@ -120,7 +120,7 @@ public class ExecuteMojoUtil {
             "systemPropertyVariables", "tempDir", "test", "testClassesDirectory",
             "testNGArtifactName", "threadCount", "threadCountClasses", "threadCountMethods",
             "threadCountSuites", "trimStackTrace", "useFile", "useManifestOnlyJar",
-            "useModulePath", "useSystemClassLoader", "useUnlimitedThreads", "workingDirectory"
+            "useModulePath", "useSystemClassLoader", "useUnlimitedThreads", "workingDirectory", "jdkToolchain"
     ));
 
     // https://maven.apache.org/surefire/maven-failsafe-plugin/verify-mojo.html