Merge pull request #145 from salesforce/minor-fixes

Minor guava update, and fix canteen error message

Author: rmichela

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

@@ -60,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

@@ -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>