Merge branch 'master' into patch-1

Author: joschi

canteen/canteen-bootstrap/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>canteen-parent</artifactId>
         <groupId>com.salesforce.servicelibs</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

canteen/canteen-bootstrap/src/main/go/main.go

@@ -11,6 +11,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path"
 	"runtime"
 	"strings"
 	"syscall"
@@ -22,7 +23,19 @@ func main() {
 
 	binary, err := exec.LookPath("java")
 	if err != nil {
-		log.Fatalf("Java execution error: %v", err)
+		javaHome, javaHomeSet := os.LookupEnv("JAVA_HOME")
+		if !javaHomeSet {
+			log.Fatalf("Java not found in PATH and JAVA_HOME not set: %v", err)
+		}
+
+		stat, err := os.Stat(javaHome)
+		if err != nil {
+			log.Fatalf("Java not found in JAVA_HOME: %v", err)
+		} else if !stat.IsDir() {
+			log.Fatalf("JAVA_HOME is not a directory: %v", err)
+		} else {
+			binary = path.Join(javaHome, "bin", "java")
+		}
 	}
 
 	args := []string{"-jar", strings.TrimPrefix(jarName, "./")}
@@ -47,7 +60,7 @@ func main() {
 	} else {
 		err = syscall.Exec(binary, append([]string{"java"}, args...), os.Environ())
 		if err != nil {
-			log.Fatalf("Bootstrap execution error: %v", os.Environ())
+			log.Fatalf("Bootstrap execution error: %v", err)
 		}
 	}
 }

canteen/canteen-it/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>canteen-parent</artifactId>
         <groupId>com.salesforce.servicelibs</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>24.1.1-jre</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

canteen/canteen-maven-plugin/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>canteen-parent</artifactId>
         <groupId>com.salesforce.servicelibs</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

canteen/pom.xml

@@ -14,7 +14,7 @@
     <groupId>com.salesforce.servicelibs</groupId>
     <artifactId>canteen-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
 
     <name>Canteen</name>
     <description>A Maven plugin for generating self-executing jars</description>