From 9438c4185312ba9fbbeacd82bb0ac2706e723856 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Fri, 15 Apr 2016 18:49:46 +0200
Subject: [PATCH] Add --no-daemon to Gradle import

Previously using the Gradle Daemon with import eclipse scripts would cause
issues with the merge plugin. Specifically, projects would randomly not
be associated to the classpath.

This change explicitly adds --no-daemon in the import scripts to ensure
that the problem does not occur.

Issue SPR-14102
(cherry picked from commit 970dc4a)
---
 import-into-eclipse.bat | 6 +++---
 import-into-eclipse.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/import-into-eclipse.bat b/import-into-eclipse.bat
index 8ba6e975fe..807cd4f07f 100644
--- a/import-into-eclipse.bat
+++ b/import-into-eclipse.bat
@@ -29,8 +29,8 @@ REM - generates OXM test classes to avoid errors on import into Eclipse
 REM - generates metadata for all subprojects
 REM - skips metadata gen for the root project (-x :eclipse) to work
 REM   around Eclipse's inability to import hierarchical project structures
-REM SET COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
-SET COMMAND=gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
+REM SET COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
+SET COMMAND=gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
 
 echo.
 echo -----------------------------------------------------------------------
@@ -69,7 +69,7 @@ echo When the above is complete, return here and press the enter key.
 
 pause
 
-set COMMAND=gradlew :eclipse
+set COMMAND=gradlew --no-daemon :eclipse
 
 echo.
 echo -----------------------------------------------------------------------
diff --git a/import-into-eclipse.sh b/import-into-eclipse.sh
index c682fbc2a4..b87c12b63c 100755
--- a/import-into-eclipse.sh
+++ b/import-into-eclipse.sh
@@ -42,7 +42,7 @@ read
 # - generates metadata for all subprojects
 # - skips metadata gen for the root project (-x :eclipse) to work
 #   around Eclipse's inability to import hierarchical project structures
-COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
+COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
 
 cat <<EOM
 
@@ -84,7 +84,7 @@ EOM
 
 read
 
-COMMAND="./gradlew :eclipse"
+COMMAND="./gradlew --no-daemon :eclipse"
 
 cat <<EOM