Merge branch '2.2.x'

Closes gh-20017

Author: snicoll

buildSrc/gradle.properties

@@ -1 +1 @@
-javaFormatVersion=0.0.19
+javaFormatVersion=0.0.20

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

@@ -146,7 +146,7 @@ private void configureSpringJavaFormat(Project project) {
 		project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));
 		project.getPlugins().apply(CheckstylePlugin.class);
 		CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-		checkstyle.setToolVersion("8.22");
+		checkstyle.setToolVersion("8.29");
 		checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 		String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();