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

Merge branch '2.5.x' into 2.6.x

Browse Source
This commit is contained in:
Phillip Webb
2023-05-10 23:33:42 -07:00
parent 2c1db0e9a2 9af19370a6
commit 60930c0285
30 changed files with 247 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,8 +90,6 @@
name="org.eclipse.wst.server_adapters.feature.feature.group"/>
<requirement
name="org.eclipse.wst.web_ui.feature.feature.group"/>
<requirement
name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
<requirement
name="org.springframework.boot.ide.main.feature.feature.group"/>
<requirement
@@ -105,7 +103,7 @@
<repository
url="https://repo.spring.io/javaformat-eclipse-update-site/"/>
<repository
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
url="https://repo.maven.apache.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
<repository
url="https://download.springsource.com/release/TOOLS/sts4/update/latest/"/>
<repository
@@ -139,7 +137,7 @@
pattern="spring-boot.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
excludedWorkingSet="//@setupTasks.8/@workingSets[name='spring-boot-smoke-tests']"/>
excludedWorkingSet="//@setupTasks.8/@workingSets[name='spring-boot-smoke-tests'] //@setupTasks.8/@workingSets[name='spring-boot-starters'] //@setupTasks.8/@workingSets[name='spring-boot-tests'] //@setupTasks.8/@workingSets[name='spring-boot-tools']"/>
</predicate>
</workingSet>
<workingSet