root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2021-09-21 12:39:38 +02:00
parent 7135051c55 b0dceb484a
commit d6570fa2ac
3 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gradle/ide.gradle
View File

@ -69,38 +69,20 @@ eclipse.classpath.file.whenMerged {
} }
} }
// Allow projects to be used as WTP modules
eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
// Include project specific settings // Include project specific settings
task eclipseSettings(type: Copy) { task eclipseSettings(type: Copy) {
from rootProject.files( from rootProject.files(
'src/eclipse/org.eclipse.jdt.ui.prefs', 'src/eclipse/org.eclipse.jdt.core.prefs',
'src/eclipse/org.eclipse.wst.common.project.facet.core.xml') 'src/eclipse/org.eclipse.jdt.ui.prefs')
into project.file('.settings/') into project.file('.settings/')
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
} }
task eclipseJdtSettings(type: Copy) {
from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
into project.file('.settings/')
outputs.upToDateWhen { false }
}
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 cleanEclipseSettings(type: Delete) { task cleanEclipseSettings(type: Delete) {
delete project.file('.settings/org.eclipse.jdt.core.prefs') delete project.file('.settings/org.eclipse.jdt.core.prefs')
delete project.file('.settings/org.eclipse.jdt.ui.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')
} }
tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings) tasks['eclipse'].dependsOn(eclipseSettings)
tasks['eclipseJdt'].dependsOn(eclipseJdtSettings) tasks['eclipseJdt'].dependsOn(eclipseSettings)
tasks['cleanEclipse'].dependsOn(cleanEclipseSettings) tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)

6
src/eclipse/org.eclipse.wst.common.component
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="${deployname}">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>

7
src/eclipse/org.eclipse.wst.common.project.facet.core.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="jst.utility"/>
<fixed facet="java"/>
<installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.8"/>
</faceted-project>