Merge branch '2.1.x' into 2.2.x

Closes gh-19283

CONTRIBUTING.adoc

@@ -137,10 +137,14 @@ can run this from the top-level directory:
 
 
 === Importing into Eclipse
-You can import the Spring Boot code into any Eclipse 2019-03-based distribution. The
+You can import the Spring Boot code into any Eclipse 2019-09-based distribution. The
 easiest way to setup a new environment is to use the Eclipse Installer with the provided
 `spring-boot-project.setup` file (in the `/eclipse` folder).
 
+NOTE: Due to m2e issue https://bugs.eclipse.org/bugs/show_bug.cgi?id=548652[#548652] you need to be running m2e 1.14.0 or higher.
+An early milestone is available from http://download.eclipse.org/technology/m2e/milestones/1.14/.
+
+
 
 ==== Using the Eclipse Installer
 Spring Boot includes a `.setup` files which can be used with the Eclipse Installer to
@@ -150,7 +154,7 @@ provision a new environment. To use the installer:
   https://www.eclipse.org/downloads/packages/installer[Eclipse Installer].
 * Switch to "Advanced Mode" using the drop down menu on the right.
 * Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
-  install, `2019-03` as the product version, and click "`next`".
+  install, `2019-09` as the product version, and click "`next`".
 * For the "`Project`" click on "`+`" to add a new setup file. Select "`Github Projects`"
   and browse for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
   copy of the source code. Click "`OK`" to add the setup file to the list.

eclipse/spring-boot-project.setup

@@ -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"