Skip to content

Commit d6570fa

Browse files
committed
Merge branch '5.3.x'
2 parents 7135051 + b0dceb4 commit d6570fa

File tree

3 files changed

+4
-35
lines changed

3 files changed

+4
-35
lines changed

gradle/ide.gradle

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -69,38 +69,20 @@ eclipse.classpath.file.whenMerged {
6969
}
7070
}
7171

72-
// Allow projects to be used as WTP modules
73-
eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
74-
7572
// Include project specific settings
7673
task eclipseSettings(type: Copy) {
7774
from rootProject.files(
78-
'src/eclipse/org.eclipse.jdt.ui.prefs',
79-
'src/eclipse/org.eclipse.wst.common.project.facet.core.xml')
80-
into project.file('.settings/')
81-
outputs.upToDateWhen { false }
82-
}
83-
84-
task eclipseJdtSettings(type: Copy) {
85-
from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
86-
into project.file('.settings/')
87-
outputs.upToDateWhen { false }
88-
}
89-
90-
task eclipseWstComponentSettings(type: Copy) {
91-
from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
75+
'src/eclipse/org.eclipse.jdt.core.prefs',
76+
'src/eclipse/org.eclipse.jdt.ui.prefs')
9277
into project.file('.settings/')
93-
expand(deployname: project.name)
9478
outputs.upToDateWhen { false }
9579
}
9680

9781
task cleanEclipseSettings(type: Delete) {
9882
delete project.file('.settings/org.eclipse.jdt.core.prefs')
9983
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
100-
delete project.file('.settings/org.eclipse.wst.common.component')
101-
delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
10284
}
10385

104-
tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
105-
tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
86+
tasks['eclipse'].dependsOn(eclipseSettings)
87+
tasks['eclipseJdt'].dependsOn(eclipseSettings)
10688
tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)

src/eclipse/org.eclipse.wst.common.component

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/eclipse/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)