Skip to content

Commit faa38c9

Browse files
committed
Upgrade to Eclipse 2019.12
Closes gh-19281
1 parent 91fff91 commit faa38c9

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

CONTRIBUTING.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,10 @@ can run this from the top-level directory:
138138

139139

140140
=== Importing into Eclipse
141-
You can import the Spring Boot code into any Eclipse 2019-09-based distribution. The
141+
You can import the Spring Boot code into any Eclipse 2019-12-based distribution. The
142142
easiest way to setup a new environment is to use the Eclipse Installer with the provided
143143
`spring-boot-project.setup` file (in the `/eclipse` folder).
144144

145-
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.
146-
An early milestone is available from https://download.eclipse.org/technology/m2e/milestones/1.14/.
147-
148145

149146

150147
==== Using the Eclipse Installer
@@ -155,7 +152,7 @@ provision a new environment. To use the installer:
155152
https://www.eclipse.org/downloads/packages/installer[Eclipse Installer].
156153
* Switch to "Advanced Mode" using the drop down menu on the right.
157154
* Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
158-
install, `2019-09` as the product version, and click "`next`".
155+
install, `2019-12` as the product version, and click "`next`".
159156
* For the "`Project`" click on "`+`" to add a new setup file. Select "`Github Projects`"
160157
and browse for `<checkout>/eclipse/spring-boot-project.setup` from your locally cloned
161158
copy of the source code. Click "`OK`" to add the setup file to the list.

eclipse/spring-boot-project.setup

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<requirement
7070
name="org.eclipse.jst.web_ui.feature.feature.group"/>
7171
<requirement
72-
name="org.eclipse.m2e.feature.feature.group" versionRange="[1.14.0,2.0.0)"/>
72+
name="org.eclipse.m2e.feature.feature.group"/>
7373
<requirement
7474
name="org.eclipse.oomph.setup.maven.feature.group"/>
7575
<requirement
@@ -86,8 +86,6 @@
8686
name="org.springframework.ide.eclipse.boot.dash.feature.feature.group"/>
8787
<requirement
8888
name="org.springframework.tooling.boot.ls.feature.feature.group"/>
89-
<repository
90-
url="http://download.eclipse.org/technology/m2e/milestones/1.14/"/>
9189
<repository
9290
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
9391
<repository
@@ -131,14 +129,26 @@
131129
<workingSet
132130
name="spring-boot-starters">
133131
<predicate
134-
xsi:type="predicates:NamePredicate"
135-
pattern="spring-boot-starter(s|-.*)"/>
132+
xsi:type="predicates:OrPredicate">
133+
<operand
134+
xsi:type="predicates:NamePredicate"
135+
pattern="spring-boot-starter(s|-.*)"/>
136+
<operand
137+
xsi:type="predicates:NamePredicate"
138+
pattern="spring-boot-starter"/>
139+
</predicate>
136140
</workingSet>
137141
<workingSet
138142
name="spring-boot-samples">
139143
<predicate
140-
xsi:type="predicates:NamePredicate"
141-
pattern="spring-boot-sample(s|-.*)"/>
144+
xsi:type="predicates:OrPredicate">
145+
<operand
146+
xsi:type="predicates:NamePredicate"
147+
pattern="spring-boot-sample(s|-.*)"/>
148+
<operand
149+
xsi:type="predicates:NamePredicate"
150+
pattern="spring-boot-samples-invoker"/>
151+
</predicate>
142152
</workingSet>
143153
<workingSet
144154
name="spring-boot-tests">
@@ -225,7 +235,7 @@
225235
<setupTask
226236
xsi:type="setup:PreferenceTask"
227237
key="/instance/org.eclipse.m2e.core/eclipse.m2.hideFoldersOfNestedProjects"
228-
value="false"/>
238+
value="true"/>
229239
<setupTask
230240
xsi:type="setup:PreferenceTask"
231241
key="/instance/org.eclipse.m2e.core/eclipse.m2.updateIndexes"

0 commit comments

Comments
 (0)