Skip to content

S
spring-boot
Commit 7e411195 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x' into 2.1.x 

Closes gh-17305
parents 374e02ca 23e119c2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
CONTRIBUTING.adoc
View file @ 7e411195
...@@ -138,8 +138,8 @@ can run this from the top-level directory: ...@@ -138,8 +138,8 @@ can run this from the top-level directory:
=== Importing into Eclipse === Importing into Eclipse
You can import the Spring Boot code into any Eclipse Oxygen based distribution. The easiest You can import the Spring Boot code into any Eclipse 2019-06 based distribution. The
way to setup a new environment is to use the Eclipse Installer with the provided easiest way to setup a new environment is to use the Eclipse Installer with the provided
`.setup` file (in the `/eclipse` folder). `.setup` file (in the `/eclipse` folder).
...@@ -147,8 +147,8 @@ way to setup a new environment is to use the Eclipse Installer with the provided ...@@ -147,8 +147,8 @@ way to setup a new environment is to use the Eclipse Installer with the provided
Spring Boot includes a `.setup` files which can be used with the Eclipse Installer to Spring Boot includes a `.setup` files which can be used with the Eclipse Installer to
provision a new environment. To use the installer: provision a new environment. To use the installer:
* Download and run the latest Eclipse Installer from * Download and run the latest
https://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse"). https://www.eclipse.org/downloads/packages/installer[Eclipse Installer].
* Switch to "Advanced Mode" using the drop down menu on the right. * 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 * Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
install and click "`next`". install and click "`next`".
......
eclipse/spring-boot-project.setup
View file @ 7e411195
...@@ -75,11 +75,17 @@ ...@@ -75,11 +75,17 @@
<requirement <requirement
name="org.sonatype.m2e.buildhelper.feature.feature.group"/> name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
<requirement <requirement
name="org.springframework.ide.eclipse.boot.feature.feature.group"/> name="org.springframework.boot.ide.main.feature.feature.group"/>
<requirement
name="org.springframework.ide.eclipse.boot.dash.feature.feature.group"/>
<requirement
name="org.springframework.tooling.boot.ls.feature.feature.group"/>
<repository <repository
url="https://dl.bintray.com/spring/javaformat-eclipse/"/> url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
<repository <repository
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/> 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.12/"/>
<description> <description>
Install the tools needed in the IDE to work with the Install the tools needed in the IDE to work with the
source code for ${scope.project.label} source code for ${scope.project.label}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment