Set Java home for maven if jdkhome set

Author: nygrenh

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.11-SNAPSHOT</version>
+    <version>0.7.12-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.11-SNAPSHOT</version>
+    <version>0.7.12-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
 
     <properties>

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

@@ -43,6 +43,11 @@ public MavenExecutionResult exec(Path projectPath, String[] mavenArgs) {
 
         InvocationRequest request = new DefaultInvocationRequest();
         request.setMavenOpts(MAVEN_OPTS);
+        String jdkhome = System.getenv("jdkhome");
+        Path jdkhomePath = Paths.get(jdkhome);
+        if (jdkhome != null && jdkhome.length() > 0 && Files.exists(jdkhomePath)) {
+            request.setJavaHome(jdkhomePath.toFile());
+        }
 
         String mavenHome = System.getenv("M3_HOME");
         if (mavenHome == null) {

tmc-langs-make/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-notests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-python3/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-qmake/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.11-SNAPSHOT</version>
+        <version>0.7.12-SNAPSHOT</version>
     </parent>
 
     <properties>