Merge branch '2.1.x'

Closes gh-17335 Closes gh-17292
2019-06-27 11:46:52 +01:00
parent 867c35a2f6 91786bc712
commit 66f1344f7c
11 changed files with 74 additions and 60 deletions
--- 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"/>
+        name="io.spring.javaformat.eclipse.feature.feature.group" versionRange="[0.0.14,0.0.15)"/>
    <requirement
        name="org.eclipse.jst.server_adapters.feature.feature.group"/>
    <requirement