Merge branch '2.2.x'
Closes gh-19692
This commit is contained in:
Phillip Webb
@@ -4,12 +4,13 @@
|
||||
xmlns:xmi="http://www.omg.org/XMI"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
|
||||
xmlns:oomph="http://www.eclipse.org/buildship/oomph/1.0"
|
||||
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
|
||||
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
|
||||
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
|
||||
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
|
||||
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
|
||||
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
|
||||
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/buildship/oomph/1.0 https://raw.githubusercontent.com/eclipse/buildship/master/org.eclipse.buildship.oomph/model/GradleImport-1.0.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
|
||||
name="spring.boot.2.3.x"
|
||||
label="Spring Boot 2.3.x">
|
||||
<setupTask
|
||||
@@ -68,8 +69,10 @@
|
||||
<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)"/>
|
||||
<requirement
|
||||
name="org.eclipse.m2e.feature.feature.group"/>
|
||||
<requirement
|
||||
name="org.eclipse.oomph.setup.maven.feature.group"/>
|
||||
<requirement
|
||||
name="org.eclipse.oomph.setup.workingsets.feature.group"/>
|
||||
<requirement
|
||||
name="org.eclipse.wst.server_adapters.feature.feature.group"/>
|
||||
@@ -78,24 +81,34 @@
|
||||
<requirement
|
||||
name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
|
||||
<requirement
|
||||
name="org.springframework.boot.ide.main.feature.feature.group"/>
|
||||
name="org.springframework.boot.ide.main.feature.feature.group"/>
|
||||
<requirement
|
||||
name="org.springframework.ide.eclipse.boot.dash.feature.feature.group"/>
|
||||
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/"/>
|
||||
name="org.springframework.tooling.boot.ls.feature.feature.group"/>
|
||||
<requirement
|
||||
name="org.eclipse.buildship.feature.group"/>
|
||||
<requirement
|
||||
name="org.eclipse.buildship.oomph.feature.group"/>
|
||||
<repository
|
||||
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
|
||||
<repository
|
||||
url="https://repo1.maven.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
|
||||
url="https://download.eclipse.org/buildship/updates/e411/releases/"/>
|
||||
<description>
|
||||
Install the tools needed in the IDE to work with the
|
||||
source code for ${scope.project.label}
|
||||
</description>
|
||||
</setupTask>
|
||||
<setupTask
|
||||
xsi:type="oomph:GradleImportTask">
|
||||
<sourceLocator
|
||||
rootFolder="${checkout.location}"
|
||||
locateNestedProjects="true"/>
|
||||
</setupTask>
|
||||
<setupTask
|
||||
xsi:type="setup.workingsets:WorkingSetTask">
|
||||
<workingSet
|
||||
@@ -119,14 +132,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">
|
||||
@@ -219,7 +244,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"
|
||||
|
||||
Reference in New Issue
Block a user