diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 20bf5f494e73..913628b8e880 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -41,20 +41,20 @@ eclipse.classpath.file.beforeMerged { classpath ->
}
}
}
-eclipse.classpath.file.whenMerged { classpath ->
- classpath.entries.findAll{ it instanceof SourceFolder }.each {
+eclipse.classpath.file.whenMerged {
+ entries.findAll{ it instanceof SourceFolder }.each {
it.output = 'bin/' + it.path.split('/')[1]
}
}
// Ensure project dependencies come after 3rd-party libs (SPR-11836)
// https://jira.spring.io/browse/SPR-11836
-eclipse.classpath.file.whenMerged { classpath ->
- classpath.entries.findAll { it instanceof ProjectDependency }.each {
+eclipse.classpath.file.whenMerged {
+ entries.findAll { it instanceof ProjectDependency }.each {
// delete from original position
- classpath.entries.remove(it)
+ entries.remove(it)
// append to end of classpath
- classpath.entries.add(it)
+ entries.add(it)
}
}
@@ -79,34 +79,30 @@ task eclipseSettings(type: Copy) {
outputs.upToDateWhen { false }
}
-task eclipseWstComponent(type: Copy) {
- from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
+task eclipseJdtSettings(type: Copy) {
+ from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
into project.file('.settings/')
- expand(deployname: project.name)
outputs.upToDateWhen { false }
}
-task eclipseJdtPrepare(type: Copy) {
- from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+task eclipseBuildship {
+ dependsOn eclipseSettings, eclipseJdtSettings
+}
+
+task eclipseWstComponentSettings(type: Copy) {
+ from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
into project.file('.settings/')
+ expand(deployname: project.name)
outputs.upToDateWhen { false }
}
-task cleanEclipseJdtUi(type: Delete) {
+task cleanEclipseSettings(type: Delete) {
delete project.file('.settings/org.eclipse.jdt.core.prefs')
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
delete project.file('.settings/org.eclipse.wst.common.component')
delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
}
-task eclipseBuildship(type: Copy) {
- from rootProject.files(
- 'src/eclipse/org.eclipse.jdt.ui.prefs',
- 'src/eclipse/org.eclipse.jdt.core.prefs')
- into project.file('.settings/')
- outputs.upToDateWhen { false }
-}
-
-tasks['eclipseJdt'].dependsOn(eclipseJdtPrepare)
-tasks['cleanEclipse'].dependsOn(cleanEclipseJdtUi)
-tasks['eclipse'].dependsOn(eclipseSettings, eclipseWstComponent)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
+tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
+tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs
index 26c219437105..1685154bbab8 100644
--- a/src/eclipse/org.eclipse.jdt.ui.prefs
+++ b/src/eclipse/org.eclipse.jdt.ui.prefs
@@ -63,4 +63,4 @@ org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=9999
org.eclipse.jdt.ui.overrideannotation=true
org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n *//**\n * @param ${param} the ${bare_field_name} to set\n *//**\n * ${tags}\n *//*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n/**\n * ${tags}\n * @author ${user}\n * @since 5.2\n *//**\n * \n *//**\n * ${tags}\n *//* (non-Javadoc)\n * ${see_to_overridden}\n *//**\n * ${tags}\n * ${see_to_target}\n */${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}\n\n\n\n// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");${body_statement}\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
+org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n *//**\n * @param ${param} the ${bare_field_name} to set\n *//**\n * ${tags}\n *//*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n/**\n * ${tags}\n * @author ${user}\n * @since 5.3.11\n *//**\n * \n *//**\n * ${tags}\n *//* (non-Javadoc)\n * ${see_to_overridden}\n *//**\n * ${tags}\n * ${see_to_target}\n */${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}\n\n\n\n// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");${body_statement}\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};