Merge branch '2.1.x' into 2.2.x

This commit is contained in:
Phillip Webb
2019-12-04 18:20:09 -08:00
2 changed files with 15 additions and 7 deletions

View File

@@ -59,7 +59,7 @@
<requirement
name="org.eclipse.jdt.feature.group"/>
<requirement
name="io.spring.javaformat.eclipse.feature.feature.group" versionRange="[0.0.15,0.0.16)"/>
name="io.spring.javaformat.eclipse.feature.feature.group"/>
<requirement
name="org.eclipse.jst.server_adapters.feature.feature.group"/>
<requirement
@@ -69,9 +69,11 @@
<requirement
name="org.eclipse.jst.web_ui.feature.feature.group"/>
<requirement
name="org.eclipse.m2e.feature.feature.group" versionRange="[1.11.0, 1.12.0)"/>
name="org.eclipse.m2e.feature.feature.group" versionRange="[1.14.0,2.0.0)"/>
<requirement
name="org.eclipse.oomph.setup.maven.feature.group" versionRange="[1.12.0, 1.13.0)"/>
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"/>
<requirement
@@ -84,12 +86,14 @@
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
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/e4.11/"/>
url="https://download.springsource.com/release/TOOLS/sts4/update/latest/"/>
<description>
Install the tools needed in the IDE to work with the
source code for ${scope.project.label}
@@ -227,7 +231,7 @@
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.m2e.core/eclipse.m2.hideFoldersOfNestedProjects"
value="true"/>
value="false"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.m2e.core/eclipse.m2.updateIndexes"