Merge pull request #71 from testmycode/mavenhack

Bundle maven and use it unless installation is found from env variables system properties

Author: jamo

pom.xml

@@ -212,6 +212,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-source-plugin</artifactId>
+              <version>3.0.1</version>
               <executions>
                 <execution>
                   <id>attach-sources</id>
@@ -271,5 +272,5 @@
             </build>
         </profile>
     </profiles>
-    
+
 </project>

tmc-langs-java/pom.xml

@@ -117,6 +117,12 @@
             <artifactId>ant</artifactId>
             <version>1.9.6</version>
         </dependency>
+        <dependency>
+
+            <groupId>org.rauschig</groupId>
+            <artifactId>jarchivelib</artifactId>
+            <version>0.7.1</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/maven/MavenExecutors.java

@@ -1,10 +1,7 @@
 package fi.helsinki.cs.tmc.langs.java.maven;
 
-import fi.helsinki.cs.tmc.langs.java.exception.MavenExecutorException;
 import fi.helsinki.cs.tmc.langs.java.maven.MavenTaskRunner.MavenExecutionResult;
 
-import com.google.common.base.Strings;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,17 +12,7 @@ public class MavenExecutors {
     private static final Logger log = LoggerFactory.getLogger(MavenExecutors.class);
 
     public static final MavenExecutionResult tryAndExec(Path directory, String[] mavenArgs) {
-        if (!Strings.isNullOrEmpty(System.getenv("M3_HOME"))
-                || !Strings.isNullOrEmpty(System.getenv("M2_HOME"))) {
-            log.info("Selected MavenInvokator");
-            try {
-                return new MavenInvokatorMavenTaskRunner().exec(directory, mavenArgs);
-            } catch (MavenExecutorException e) {
-                log.info("trying with MvnCli, MavenInvokatorMavenTaskRunner failed with {}", e);
-                return new MvnCliMavenRunner().exec(directory, mavenArgs);
-            }
-        }
-        log.info("Selected MvnCli");
-        return new MvnCliMavenRunner().exec(directory, mavenArgs);
+        log.info("Defaulting to MavenInvokator");
+        return new MavenInvokatorMavenTaskRunner().exec(directory, mavenArgs);
     }
 }

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/maven/MavenInvokatorMavenTaskRunner.java

@@ -2,24 +2,34 @@
 
 import fi.helsinki.cs.tmc.langs.java.exception.MavenExecutorException;
 
+import com.google.common.base.Preconditions;
+
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.maven.shared.invoker.DefaultInvocationRequest;
 import org.apache.maven.shared.invoker.DefaultInvoker;
 import org.apache.maven.shared.invoker.InvocationOutputHandler;
 import org.apache.maven.shared.invoker.InvocationRequest;
 import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.MavenInvocationException;
-
 import org.codehaus.plexus.util.cli.CommandLineException;
-
+import org.rauschig.jarchivelib.ArchiveFormat;
+import org.rauschig.jarchivelib.Archiver;
+import org.rauschig.jarchivelib.ArchiverFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 
+
 public class MavenInvokatorMavenTaskRunner implements MavenTaskRunner {
 
     private static final Logger log = LoggerFactory.getLogger(MavenInvokatorMavenTaskRunner.class);
@@ -33,14 +43,23 @@ public MavenExecutionResult exec(Path projectPath, String[] mavenArgs) {
         InvocationRequest request = new DefaultInvocationRequest();
         request.setMavenOpts(MAVEN_OPTS);
 
-        DefaultInvoker invoker = new DefaultInvoker();
         String mavenHome = System.getenv("M3_HOME");
         if (mavenHome == null) {
             mavenHome = System.getenv("M2_HOME");
         }
         if (mavenHome == null) {
             mavenHome = System.getenv("MAVEN_HOME");
         }
+        if (mavenHome == null) {
+            mavenHome = System.getProperty("maven.home");
+        }
+        if (mavenHome == null) {
+            mavenHome = useBundledMaven().toString();
+        }
+
+        log.info("Using maven at: {}", mavenHome);
+
+        DefaultInvoker invoker = new DefaultInvoker();
         invoker.setMavenHome(new File(mavenHome));
 
         final ByteArrayOutputStream outBuf = new ByteArrayOutputStream();
@@ -75,4 +94,57 @@ public void consumeLine(String line) {
             throw new MavenExecutorException(e);
         }
     }
+
+    private Path useBundledMaven() {
+        Path mavenHome = getConfigDirectory();
+        if (Files.exists(mavenHome)) {
+            log.info("Maven already extracted");
+
+            // Add the name of the extracted folder to the path
+            return mavenHome.resolve("apache-maven-3.3.9");
+        }
+        log.info("Maven bundle not previously extracted, extracting...");
+        try {
+            InputStream data = getClass().getResourceAsStream("apache-maven-3.3.9.zip");
+            Preconditions.checkNotNull(
+                    data, "Couldn't load bundled maven from tmc-langs-java.jar.");
+            Path tmpFile = Files.createTempFile("tmc-maven", "zip");
+            Files.copy(data, tmpFile, StandardCopyOption.REPLACE_EXISTING);
+            Archiver archiver = ArchiverFactory.createArchiver(ArchiveFormat.ZIP);
+            archiver.extract(tmpFile.toFile(), mavenHome.toFile());
+            try {
+                Files.deleteIfExists(tmpFile);
+            } catch (IOException e) {
+                log.warn("Deleting tmp apache-maven.zip failed", e);
+            }
+
+                // Add the name of the extracted folder to the path
+            return mavenHome.resolve("apache-maven-3.3.9");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static Path getConfigDirectory() {
+        Path configPath;
+
+        if (SystemUtils.IS_OS_WINDOWS) {
+            String appdata = System.getenv("APPDATA");
+            if (appdata == null) {
+                configPath = Paths.get(System.getProperty("user.home"));
+            } else {
+                configPath = Paths.get(appdata);
+            }
+        } else {
+            //Assume we're using Unix (Linux, Mac OS X or *BSD)
+            String configEnv = System.getenv("XDG_CONFIG_HOME");
+
+            if (configEnv != null && configEnv.length() > 0) {
+                configPath = Paths.get(configEnv);
+            } else {
+                configPath = Paths.get(System.getProperty("user.home")).resolve(".config");
+            }
+        }
+        return configPath.resolve("tmc");
+    }
 }

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/maven/MavenTaskRunner.java

@@ -1,12 +1,14 @@
 package fi.helsinki.cs.tmc.langs.java.maven;
 
+import org.apache.maven.cli.MavenCli;
+
 import java.nio.file.Path;
 
 public interface MavenTaskRunner {
 
     MavenExecutionResult exec(Path directory, String[] mavenArgs);
 
-    public final class MavenExecutionResult {
+    final class MavenExecutionResult {
 
         private int exitCode;