From 716726aa50f5bf0fafacc94cad6392bb29c16504 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 8 Feb 2018 13:26:37 -0800
Subject: [PATCH] Update Eclipse Oomph setup for Oxygen

See gh-8513
---
 CONTRIBUTING.adoc                 |  3 +-
 eclipse/spring-boot-project.setup | 47 ++++++++++++-------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 1c4b06660f..846566bce1 100755
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -153,7 +153,7 @@ Spring Boot includes a `.setup` files which can be used with the Eclipse Install
 provision a new environment. To use the installer:
 
 * Download and run the latest Eclipse Installer from
-  http://www.eclipse.org/downloads/[eclipse.org/downloads/].
+  http://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse").
 * 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 and click "`next`".
@@ -225,4 +225,3 @@ The sample applications are used as integration tests during the build (when you
 they cannot be called directly, and so instead are launched via the
 `maven-invoker-plugin`. If you encounter build failures running the integration tests,
 check the `build.log` file in the appropriate sample directory.
-
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index acd7baeb57..abcd30a269 100644
--- a/eclipse/spring-boot-project.setup
+++ b/eclipse/spring-boot-project.setup
@@ -11,8 +11,8 @@
     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 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="spring.boot"
-    label="Spring Boot">
+    name="spring.boot.1.5.x"
+    label="Spring Boot 1.5.x">
   <setupTask
       xsi:type="setup:VariableTask"
       type="FOLDER"
@@ -55,8 +55,7 @@
   <setupTask
       xsi:type="setup.p2:P2Task">
     <requirement
-        name="epp.package.java"
-        versionRange="[4.5.0,4.6.0)"/>
+        name="epp.package.java"/>
     <requirement
         name="org.eclipse.platform.feature.group"/>
     <requirement
@@ -65,12 +64,6 @@
         name="AnyEditTools.feature.group"/>
     <requirement
         name="org.eclipse.m2e.maveneclipse.feature.feature.group"/>
-    <requirement
-        name="org.springframework.ide.eclipse.boot.dash.feature.feature.group"/>
-    <requirement
-        name="org.springframework.ide.eclipse.feature.feature.group"/>
-    <requirement
-        name="org.springframework.ide.eclipse.maven.feature.feature.group"/>
     <requirement
         name="org.eclipse.jst.server_adapters.feature.feature.group"/>
     <requirement
@@ -85,45 +78,41 @@
         name="org.eclipse.wst.web_ui.feature.feature.group"/>
     <requirement
         name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.mylyn.github.feature.feature.group"/>
-    <requirement
-        name="org.springframework.ide.eclipse.jdt.formatter.feature.feature.group"/>
     <repository
-        url="http://download.eclipse.org/technology/epp/packages/mars/R"/>
+        url="http://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
     <repository
-        url="http://download.eclipse.org/releases/mars"/>
+        url="http://download.eclipse.org/releases/oxygen/"/>
     <repository
-        url="http://andrei.gmxhome.de/eclipse"/>
+        url="http://andrei.gmxhome.de/eclipse/"/>
     <repository
         url="https://dl.bintray.com/philwebb/m2eclipse-maveneclipse"/>
-    <repository
-        url="https://dl.bintray.com/philwebb/spring-eclipse-code-formatter"/>
-    <repository
-        url="http://dist.springsource.com/release/TOOLS/update/e4.5"/>
     <repository
         url="http://download.eclipse.org/egit/github/updates/"/>
+    <repository
+        url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
     <description>
       Install the tools needed in the IDE to work with the
       source code for ${scope.project.label}
     </description>
   </setupTask>
   <setupTask
-      xsi:type="maven:MavenImportTask"
-      id="">
+      xsi:type="maven:MavenImportTask">
     <sourceLocator
-        rootFolder="${checkout.location}"/>
+        rootFolder="${checkout.location}"
+        locateNestedProjects="true"/>
     <description></description>
   </setupTask>
   <setupTask
       xsi:type="maven:MavenImportTask">
     <sourceLocator
-        rootFolder="${checkout.location}/spring-boot-samples"/>
+        rootFolder="${checkout.location}/spring-boot-samples"
+        locateNestedProjects="true"/>
   </setupTask>
   <setupTask
       xsi:type="maven:MavenImportTask">
     <sourceLocator
-        rootFolder="${checkout.location}/spring-boot-deployment-tests"/>
+        rootFolder="${checkout.location}/spring-boot-deployment-tests"
+        locateNestedProjects="true"/>
   </setupTask>
   <setupTask
       xsi:type="setup.workingsets:WorkingSetTask">
@@ -224,9 +213,9 @@
         key="/instance/org.eclipse.jdt.ui/smartPaste"
         value="true"/>
     <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_templates"
-          value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>&lt;templates>&lt;template autoinsert=&quot;false&quot; context=&quot;java&quot; deleted=&quot;false&quot; description=&quot;Surround code with formatter off and formatter on tags&quot; enabled=&quot;true&quot; name=&quot;noformat&quot;>// @formatter:off&#xA;$${cursor} $${line_selection}&#xA;// @formatter:on&lt;/template>&lt;/templates>"/>
+        xsi:type="setup:PreferenceTask"
+        key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_templates"
+        value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>&lt;templates>&lt;template autoinsert=&quot;false&quot; context=&quot;java&quot; deleted=&quot;false&quot; description=&quot;Surround code with formatter off and formatter on tags&quot; enabled=&quot;true&quot; name=&quot;noformat&quot;>// @formatter:off&#xA;$${cursor} $${line_selection}&#xA;// @formatter:on&lt;/template>&lt;/templates>"/>
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"