Merge branch '2.1.x'

Closes gh-17306
This commit is contained in:
Andy Wilkinson
2019-06-27 10:42:11 +01:00
2 changed files with 10 additions and 6 deletions

View File

@@ -66,10 +66,14 @@
name="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
<requirement
name="org.eclipse.jst.server_ui.feature.feature.group"/>
<requirement
name="org.eclipse.wst.server_adapters.feature.feature.group"/>
<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)"/>
<requirement
name="org.eclipse.oomph.setup.maven.feature.group" versionRange="[1.12.0, 1.13.0)"/>
<requirement
name="org.eclipse.wst.server_adapters.feature.feature.group"/>
<requirement
name="org.eclipse.wst.web_ui.feature.feature.group"/>
<requirement
@@ -85,7 +89,7 @@
<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.12/"/>
url="https://download.springsource.com/release/TOOLS/sts4/update/e4.11/"/>
<description>
Install the tools needed in the IDE to work with the
source code for ${scope.project.label}