From 56026863e8dc0cb40d68846b3cbbd0e8c43381a0 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 1 Feb 2012 16:06:16 -0800 Subject: [PATCH] Remove javabuilder from spring-aspects .project Previously, the build script was configured to add ajbuilder to the set of Eclipse/STS build commands, meaning that both javabuilder and ajbuilder would be present for spring-aspects. This causes unpredictable behavior, as these two builders compete with each other. As ajbuilder is a functional superset of javabuilder, this commit ensures that only the former is present for spring-aspects' .project file. Also removed warning language in import-into-eclipse.sh about spring-aspects failing after adding Git support, as this intermittent problem was almost certainly an artifact of the situation described above. --- build.gradle | 3 ++- import-into-eclipse.sh | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0d83f47c09..dbed9ecaad 100644 --- a/build.gradle +++ b/build.gradle @@ -445,7 +445,8 @@ project('spring-aspects') { } eclipse.project { natures += 'org.eclipse.ajdt.ui.ajnature' - buildCommand 'org.eclipse.ajdt.core.ajbuilder' + buildCommands = [new org.gradle.plugins.ide.eclipse.model. + BuildCommand('org.eclipse.ajdt.core.ajbuilder')] } } diff --git a/import-into-eclipse.sh b/import-into-eclipse.sh index c977c73618..8710334750 100755 --- a/import-into-eclipse.sh +++ b/import-into-eclipse.sh @@ -116,9 +116,5 @@ STEP 5: Enable Git support for all projects When complete, you'll hvae have Git support enabled for all projects. -Note: if any projects have errors after adding Git support -(e.g. spring-aspects), simply go to Project > Clean... and clean that -project. This should remove any errors. - You're ready to code! Goodbye! EOM