Merge branch '2.2.x'

Closes gh-19692

CONTRIBUTING.adoc

@@ -98,7 +98,7 @@ The project can be built from the root directory using the standard Gradle comma
 
 
 === Importing into Eclipse
-You can import the Spring Boot code into any Eclipse 2019-09-based distribution. The
+You can import the Spring Boot code into any Eclipse 2019-12-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).
 
@@ -112,7 +112,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-09` as the product version, and click "`next`".
+  install, `2019-12` 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

@@ -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)"/>
+        name="org.eclipse.m2e.feature.feature.group"/>
-     <requirement
+    <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"/>
+        name="org.springframework.tooling.boot.ls.feature.feature.group"/>
-    <repository
+    <requirement
-          url="http://download.eclipse.org/technology/m2e/milestones/1.14/"/>
+        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"
+          xsi:type="predicates:OrPredicate">
-          pattern="spring-boot-starter(s|-.*)"/>
+        <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"
+          xsi:type="predicates:OrPredicate">
-          pattern="spring-boot-smoke-test(s|-.*)"/>
+        <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"