Merge pull request #24 from talios/usetoolchains

Added support for maven toolchains
luontola · Jul 19, 2014 · 5a46b8e · 5a46b8e
2 parents b2f4451 + c97d496
commit 5a46b8e
Showing 1 changed file with 42 additions and 8 deletions.
diff --git a/...lambda-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessClassesMojo.java b/...lambda-maven-plugin/src/main/java/net/orfjackal/retrolambda/maven/ProcessClassesMojo.java
@@ -7,14 +7,34 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.*;
-import org.apache.maven.plugins.annotations.*;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.BuildPluginManager;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-
-import java.io.*;
-import java.util.*;
-
-import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeSet;
+
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.attribute;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.attributes;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.element;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.name;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
 
 abstract class ProcessClassesMojo extends AbstractMojo {
 
@@ -25,6 +45,9 @@ abstract class ProcessClassesMojo extends AbstractMojo {
             "1.8", 52
     );
 
+    @Component
+    private ToolchainManager toolchainManager;
+
     @Component
     private MavenSession session;
 
@@ -73,6 +96,17 @@ public void execute() throws MojoExecutionException {
         processClasses();
     }
 
+    private String getJavaCommandViaToolChain() {
+        Toolchain tc = toolchainManager.getToolchainFromBuildContext( "jdk", session);
+        if (tc != null) {
+            getLog().info("Using JDK Toolchain: " + tc );
+            String javaCommand = tc.findTool("java");
+            return javaCommand;
+        } else {
+            return java8home + "/bin/java";
+        }
+    }
+
     private void validateTarget() throws MojoExecutionException {
         if (!targetBytecodeVersions.containsKey(target)) {
             String possibleValues = Joiner.on(", ").join(new TreeSet<String>(targetBytecodeVersions.keySet()));
@@ -120,7 +154,7 @@ private void processClasses() throws MojoExecutionException {
                                         attribute("refid", getClasspathId()))),
                         element("exec",
                                 attributes(
-                                        attribute("executable", java8home + "/bin/java"),
+                                        attribute("executable", getJavaCommandViaToolChain()),
                                         attribute("failonerror", "true")),
                                 element("arg", attribute("value", "-Dretrolambda.bytecodeVersion=" + targetBytecodeVersions.get(target))),
                                 element("arg", attribute("value", "-Dretrolambda.inputDir=" + getInputDir().getAbsolutePath())),