Use tools provider

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>minimaven</artifactId>
-	<version>2.1.5-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 
 	<name>Minimal support for Maven projects</name>
 	<description>A minimal build system interpreting Maven-style pom.xml files</description>

src/main/java/org/scijava/minimaven/JavaCompiler.java

@@ -37,13 +37,17 @@
 import java.io.Writer;
 import java.lang.reflect.Method;
 
+import javax.tools.ToolProvider;
+
+import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
 import org.scijava.util.ProcessUtils;
 
 /**
  * Encapsulates the Java compiler, falling back to command-line {@code javac}.
  * 
  * @author Johannes Schindelin
+ * @author Mark Hiner
  */
 public class JavaCompiler {
 	protected PrintStream err, out;
@@ -57,9 +61,29 @@ public JavaCompiler(PrintStream err, PrintStream out) {
 
 	// this function handles the javac singleton
 	public void call(String[] arguments,
-			boolean verbose) throws CompileError {
+		boolean verbose) throws CompileError {
+		call(arguments, verbose, false);
+	}
+
+	public void call(String[] arguments,
+			boolean verbose, boolean debug) throws CompileError {
 		synchronized(this) {
 			try {
+				javax.tools.JavaCompiler sysc = ToolProvider.getSystemJavaCompiler();
+				if (sysc != null) {
+					if (debug) {
+						err.print("Found tools compiler: " + sysc.getClass());
+						err.print(ClassUtils.getLocation(sysc.getClass()));
+					}
+					sysc.run(null,  out, err, arguments);
+					return;
+				}
+
+				if (verbose){
+					err.println(
+						"No javax.tools.JavaCompiler available. Checking for explicit javac.");
+				}
+
 				if (javac == null) {
 					JarClassLoader loader = discoverJavac();
 					Class<?> main = loader == null ?
@@ -83,9 +107,11 @@ public void call(String[] arguments,
 				/* re-throw */
 				throw e;
 			} catch (Exception e) {
-				e.printStackTrace(err);
-				err.println("Could not find javac " + e
-					+ ", falling back to system javac");
+				if (verbose) {
+					e.printStackTrace(err);
+					err.println("Could not find javac " + e
+						+ ", falling back to system javac");
+				}
 			}
 		}
 

src/main/java/org/scijava/minimaven/MavenProject.java

@@ -474,7 +474,7 @@ public void build(boolean makeJar, boolean forceBuild, boolean includeSources) t
 			}
 			String[] array = arguments.toArray(new String[arguments.size()]);
 			if (env.javac != null)
-				env.javac.call(array, env.verbose);
+				env.javac.call(array, env.verbose, env.debug);
 		}
 
 		updateRecursively(resources, target, false);