Merge branch '2.1.x'

See gh-17362

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" versionRange="[0.0.14,0.0.15)"/>
+        name="io.spring.javaformat.eclipse.feature.feature.group" versionRange="[0.0.15,0.0.16)"/>
     <requirement
         name="org.eclipse.jst.server_adapters.feature.feature.group"/>
     <requirement

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.14")
+		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15")
 	}
 }