Skip to content

Commit 9438c41

Browse files
Rob Winchjhoeller
authored andcommitted
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)
1 parent 0075240 commit 9438c41

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

import-into-eclipse.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ REM - generates OXM test classes to avoid errors on import into Eclipse
2929
REM - generates metadata for all subprojects
3030
REM - skips metadata gen for the root project (-x :eclipse) to work
3131
REM around Eclipse's inability to import hierarchical project structures
32-
REM SET COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
33-
SET COMMAND=gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
32+
REM SET COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
33+
SET COMMAND=gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
3434

3535
echo.
3636
echo -----------------------------------------------------------------------
@@ -69,7 +69,7 @@ echo When the above is complete, return here and press the enter key.
6969

7070
pause
7171

72-
set COMMAND=gradlew :eclipse
72+
set COMMAND=gradlew --no-daemon :eclipse
7373

7474
echo.
7575
echo -----------------------------------------------------------------------

import-into-eclipse.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ read
4242
# - generates metadata for all subprojects
4343
# - skips metadata gen for the root project (-x :eclipse) to work
4444
# around Eclipse's inability to import hierarchical project structures
45-
COMMAND="./gradlew cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
45+
COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
4646

4747
cat <<EOM
4848
@@ -84,7 +84,7 @@ EOM
8484

8585
read
8686

87-
COMMAND="./gradlew :eclipse"
87+
COMMAND="./gradlew --no-daemon :eclipse"
8888

8989
cat <<EOM
9090

0 commit comments

Comments
 (0)