Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse Source 
Closes gh-19688
This commit is contained in:
Phillip Webb
2020-01-13 12:21:54 -08:00
parent b3d32c7214 faa38c946f
commit 8edffc8ed7
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eclipse/spring-boot-project.setup
View File

@@ -69,7 +69,7 @@
<requirement
name="org.eclipse.jst.web_ui.feature.feature.group"/>
<requirement
name="org.eclipse.m2e.feature.feature.group" versionRange="[1.14.0,2.0.0)"/>
name="org.eclipse.m2e.feature.feature.group"/>
<requirement
name="org.eclipse.oomph.setup.maven.feature.group"/>
<requirement
@@ -86,8 +86,6 @@
name="org.springframework.ide.eclipse.boot.dash.feature.feature.group"/>
<requirement
name="org.springframework.tooling.boot.ls.feature.feature.group"/>
<repository
url="http://download.eclipse.org/technology/m2e/milestones/1.14/"/>
<repository
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
<repository
@@ -131,14 +129,26 @@
<workingSet
name="spring-boot-starters">
<predicate
xsi:type="predicates:NamePredicate"
pattern="spring-boot-starter(s|-.*)"/>
xsi:type="predicates:OrPredicate">
<operand
xsi:type="predicates:NamePredicate"
pattern="spring-boot-starter(s|-.*)"/>
<operand
xsi:type="predicates:NamePredicate"
pattern="spring-boot-starter"/>
</predicate>
</workingSet>
<workingSet
name="spring-boot-smoke-tests">
<predicate
xsi:type="predicates:NamePredicate"
pattern="spring-boot-smoke-test(s|-.*)"/>
xsi:type="predicates:OrPredicate">
<operand
xsi:type="predicates:NamePredicate"
pattern="spring-boot-smoke-test(s|-.*)"/>
<operand
xsi:type="predicates:NamePredicate"
pattern="spring-boot-smoke-tests-invoker"/>
</predicate>
</workingSet>
<workingSet
name="spring-boot-tests">
@@ -231,7 +241,7 @@
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.m2e.core/eclipse.m2.hideFoldersOfNestedProjects"
value="false"/>
value="true"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.m2e.core/eclipse.m2.updateIndexes"