Merge branch '2.7.x'

Closes gh-31170

buildSrc/build.gradle

@@ -8,6 +8,11 @@ repositories {
 	mavenCentral()
 	gradlePluginPortal()
 	maven { url "https://repo.spring.io/release" }
+	mavenLocal {
+		content {
+			includeGroup "io.spring.javaformat"
+		}
+	}
 }
 
 sourceCompatibility = 17
@@ -33,8 +38,6 @@ dependencies {
 }
 
 checkstyle {
-	def archive = configurations.checkstyle.filter { it.name.startsWith("spring-javaformat-checkstyle")}
-	config = resources.text.fromArchiveEntry(archive, "io/spring/javaformat/checkstyle/checkstyle.xml")
 	toolVersion = 8.11
 }
 

buildSrc/config/checkstyle/checkstyle.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+		"https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+	<module name="io.spring.javaformat.checkstyle.SpringChecks">
+		<property name="excludes" value="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck" />
+	</module>
+</module>

buildSrc/gradle.properties

@@ -1 +1 @@
-javaFormatVersion=0.0.31
+javaFormatVersion=0.0.33

buildSrc/settings.gradle

@@ -3,11 +3,4 @@ pluginManagement {
 		mavenCentral()
 		gradlePluginPortal()
 	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "io.spring.javaformat") {
-				useModule "io.spring.javaformat:spring-javaformat-gradle-plugin:${requested.version}"
-			}
-		}
-	}
 }