Update maven stuff

Author: jamo

tmc-langs-java/pom.xml

@@ -121,23 +121,23 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-embedder</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.9</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-aether-provider</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.9</version>
         </dependency>
 
         <dependency>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-invoker</artifactId>
-            <version>2.1.1</version>
+            <version>2.2</version>
             <type>jar</type>
         </dependency>
 
@@ -181,12 +181,12 @@
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http</artifactId>
-            <version>2.9</version>
+            <version>2.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-provider-api</artifactId>
-            <version>2.9</version>
+            <version>2.10</version>
         </dependency>
     </dependencies>
 

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

@@ -15,7 +15,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"))) {
+        if (!Strings.isNullOrEmpty(System.getenv("M3_HOME")) || !Strings.isNullOrEmpty(System.getenv("M2_HOME"))) {
             log.info("Selected MavenInvokator");
             try {
                 return new MavenInvokatorMavenTaskRunner().exec(directory, mavenArgs);

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

@@ -34,8 +34,14 @@ public MavenExecutionResult exec(Path projectPath, String[] mavenArgs) {
         request.setMavenOpts(MAVEN_OPTS);
 
         DefaultInvoker invoker = new DefaultInvoker();
-
-        invoker.setMavenHome(new File(System.getenv("M3_HOME")));
+        String mavenHome = System.getenv("M3_HOME");
+        if (mavenHome == null) {
+            mavenHome = System.getenv("M2_HOME");
+        }
+        if (mavenHome == null) {
+            mavenHome = System.getenv("MAVEN_HOME");
+        }
+        invoker.setMavenHome(new File(mavenHome));
 
         final ByteArrayOutputStream outBuf = new ByteArrayOutputStream();
         final PrintStream out = new PrintStream(outBuf);

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

@@ -10,11 +10,8 @@ public class MvnCliMavenRunner implements MavenTaskRunner {
 
     @Override
     public MavenExecutionResult exec(Path projectPath, String[] mavenArgs) {
-        // for MavenCli 3.3.3 update
-        // String multimoduleProjectDirectory =
-        // System.getProperty(MavenCli.MULTIMODULE_PROJECT_DIRECTORY);
-        // System.setProperty(
-        // MavenCli.MULTIMODULE_PROJECT_DIRECTORY, projectPath.toAbsolutePath().toString());
+         System.setProperty(
+         MavenCli.MULTIMODULE_PROJECT_DIRECTORY, projectPath.toAbsolutePath().toString());
 
         ByteArrayOutputStream outBuf = new ByteArrayOutputStream();
         ByteArrayOutputStream errBuf = new ByteArrayOutputStream();
@@ -28,9 +25,6 @@ public MavenExecutionResult exec(Path projectPath, String[] mavenArgs) {
                         new PrintStream(outBuf),
                         new PrintStream(errBuf));
 
-        //if (multimoduleProjectDirectory != null) {
-        //System.setProperty(MavenCli.MULTIMODULE_PROJECT_DIRECTORY, multimoduleProjectDirectory);
-        // }
         return new MavenTaskRunner.MavenExecutionResult()
                 .setExitCode(compileResult)
                 .setStdOut(outBuf.toByteArray())

tmc-langs-java/src/test/java/fi/helsinki/cs/tmc/langs/java/maven/MavenPluginTest.java

@@ -16,6 +16,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Locale;
@@ -87,7 +88,12 @@ public void testMavenProjectWithFailingTestsCompilesAndFailsTests() {
     public void testFailingMavenProjectHasOneFailedTest() {
         Path path = TestUtils.getPath(getClass(), "maven_exercise");
         RunResult result = mavenPlugin.runTests(path);
-
+//        try {
+//            System.out.println(new String(result.logs.get("stderr"), "utf-8"));
+//            System.out.println(new String(result.logs.get("stdout"), "utf-8"));
+//        } catch (UnsupportedEncodingException e) {
+//            e.printStackTrace();
+//        }
         assertEquals(1, result.testResults.size());
     }