From 818d55365bfbe25a22b7e9b56e496f87236311fb Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 4 Dec 2019 17:56:02 -0800
Subject: [PATCH] Upgrade to Eclipse 2019.9

Upgrade our Oomph setup to use Eclipse 2019.9

See gh-19280
---
 CONTRIBUTING.adoc                 |  4 ++--
 eclipse/spring-boot-project.setup | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index ea425f97ba..7286b22a57 100755
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -138,7 +138,7 @@ 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).
 
@@ -151,7 +151,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.
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index 1e8909ef39..c644c293cb 100644
--- a/eclipse/spring-boot-project.setup
+++ b/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"/>
     <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
@@ -89,7 +91,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.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}