From 74ea6ab0dffed872434711e3ae58433526ccecad Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3.com>
Date: Tue, 29 Nov 2016 12:07:15 +0000
Subject: [PATCH 1/3] Fixed runnodes when JAVA_HOME is not set.

---
 .../src/main/resources/net/corda/plugins/runnodes    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes b/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
index bc27ae3233..b735daf054 100755
--- a/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
+++ b/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
@@ -27,11 +27,13 @@ if which osascript >/dev/null; then
 end tell"
     osascript -e "$script"
 else
-    # Some other UNIX, probably Linux
+    # Some other UNIX, probably Linux (does not support msys or cygwin)
+    # TODO: msys and cygwin support
     #
-    # This next line is safe even if JAVA_HOME is unset. If it is set, it means that java overrides the
-    # default system java, which is what we want.
-    export PATH=$JAVA_HOME/bin:$PATH
+    # If it is set, it means that java overrides the default system java, which is what we want.
+    if [ -n "${JAVA_HOME-}" ]; then
+	export PATH="$JAVA_HOME/bin:$PATH"
+    fi
     for dir in `ls`; do
         if [ -d $dir ]; then
             pushd $dir >/dev/null
@@ -39,4 +41,4 @@ else
             popd >/dev/null
         fi
     done
-fi
\ No newline at end of file
+fi

From 1f88d0fa769eb244e231176e3fb502c3ad869ebc Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3.com>
Date: Tue, 29 Nov 2016 13:31:46 +0000
Subject: [PATCH 2/3] Updated plugin versions.

---
 gradle-plugins/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-plugins/build.gradle b/gradle-plugins/build.gradle
index de6e452590..f80527f8c5 100644
--- a/gradle-plugins/build.gradle
+++ b/gradle-plugins/build.gradle
@@ -2,7 +2,7 @@
 // or if you are developing these plugins. See the readme for more information.
 
 buildscript {
-    ext.gradle_plugins_version = "0.6" // Our version: bump this on release.
+    ext.gradle_plugins_version = "0.6.1" // Our version: bump this on release.
     ext.corda_published_version = "0.5" // Depend on our existing published publishing plugin.
 
     repositories {

From 73fafa60f0538e66d61e22dad6b9ca0ca419a61d Mon Sep 17 00:00:00 2001
From: Clinton Alexander <clinton.alexander@r3cev.com>
Date: Wed, 30 Nov 2016 15:45:04 +0000
Subject: [PATCH 3/3] Bumped to the newest version of the gradle plugins.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2cc637fc7d..3c61c65f26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     // Our version: bump this on release.
     ext.corda_version = "0.7-SNAPSHOT"
+    ext.gradle_plugins_version = "0.6.1"
 
-    ext.gradle_plugins_version = "0.5.7"
     ext.kotlin_version = '1.0.5'
     ext.quasar_version = '0.7.6'
     ext.asm_version = '0.5.3'