Merge branch '2.7.x' into 3.0.x

philwebb · philwebb · commit d3104257d7ce · 2023-02-21T22:37:44.000-08:00
Closes gh-34330
diff --git 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"
 }
 
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -1 +1 @@
-javaFormatVersion=0.0.35
+javaFormatVersion=0.0.38

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ nohttp {`
`14`	`14`	`source.exclude "/build/"`
`15`	`15`	`source.exclude "/out/"`
`16`	`16`	`source.exclude "/target/"`
	`17`	`+ source.exclude "/.settings/"`
	`18`	`+ source.exclude "**/.classpath"`
	`19`	`+ source.exclude "**/.project"`
`17`	`20`	`source.exclude "spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/export.tar"`
`18`	`21`	`}`
`19`	`22`