Merge branch '2.7.x' into 3.0.x

Closes gh-34330
2 years ago · d3104257d7
parent 0d0566b2cd b93c9f7fec
commit d3104257d7
2 changed files with 4 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -14,6 +14,9 @@ nohttp {
 	source.exclude "**/build/**"
 	source.exclude "**/out/**"
 	source.exclude "**/target/**"
+	source.exclude "**/.settings/**"
+	source.exclude "**/.classpath"
+	source.exclude "**/.project"
 	source.exclude "spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/export.tar"
 }

--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@ -1 +1 @@
-javaFormatVersion=0.0.35
+javaFormatVersion=0.0.38