Merge branch '2.0.x' into 2.1.x

Closes gh-17334
2019-06-27 11:39:17 +01:00
parent 096951d531 256a0d636d
commit 91786bc712
5 changed files with 64 additions and 50 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