From 818d55365bfbe25a22b7e9b56e496f87236311fb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 4 Dec 2019 17:56:02 -0800 Subject: [PATCH 1/3] 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 ea425f97ba5..7286b22a57a 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 `/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 1e8909ef392..c644c293cbf 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -59,7 +59,7 @@ + name="io.spring.javaformat.eclipse.feature.feature.group"/> + name="org.eclipse.m2e.feature.feature.group"/> + name="org.eclipse.oomph.setup.maven.feature.group"/> + + url="https://download.springsource.com/release/TOOLS/sts4/update/latest/"/> Install the tools needed in the IDE to work with the source code for ${scope.project.label} From d29444baf1a9447b6b123e1a7d3ebfcc7c5a9851 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 4 Dec 2019 17:58:22 -0800 Subject: [PATCH 2/3] No longer hide nested projects Change the Oomph setup to no longer hide nested Maven projects so that https://bugs.eclipse.org/bugs/show_bug.cgi?id=553789 doesn't get triggered. See gh-19280 --- eclipse/spring-boot-project.setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index c644c293cbf..f2c947c1fa3 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -223,7 +223,7 @@ + value="false"/> Date: Wed, 4 Dec 2019 17:59:22 -0800 Subject: [PATCH 3/3] Use Eclipse m2e 1.14.0 Update our Oomph setup to use m2e 1.14.0 from their milestone update site. Unfortunately we need to use the milestone since the fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=548652 has not yet made it into a stable m2e release. Closes gh-19280 --- CONTRIBUTING.adoc | 4 ++++ eclipse/spring-boot-project.setup | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 7286b22a57a..2e33e6fd383 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -142,6 +142,10 @@ You can import the Spring Boot code into any Eclipse 2019-09-based distribution. 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 diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index f2c947c1fa3..db9d905a57d 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -69,7 +69,7 @@ + name="org.eclipse.m2e.feature.feature.group" versionRange="[1.14.0,2.0.0)"/> +