Merge branch '3.0.x' into 3.1.x

marcusdacoregio · marcusdacoregio · commit 646295a173d0 · 2023-07-19T09:48:40.000-03:00
diff --git a/build.gradle b/build.gradle
@@ -48,6 +48,11 @@ nohttp {
 	source.exclude "spring-session-docs/modules/ROOT/examples/**/build/**"
 }
 
+tasks.named("updateDependencies") {
+	// we aren't Gradle 8 compatible yet
+	checkForGradleUpdate = false
+}
+
 updateDependenciesSettings {
 	gitHub {
 		organization = "spring-projects"
@@ -59,9 +64,10 @@ updateDependenciesSettings {
 		alphaBetaVersions()
 		snapshotVersions()
 	}
-	addFiles({
+	setFiles({
 		return [
-				project.file("gradle/dependency-management.gradle")
+				project.file("gradle/dependency-management.gradle"),
+				project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")
 		]
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ nohttp {`
`48`	`48`	`source.exclude "spring-session-docs/modules/ROOT/examples//build/"`
`49`	`49`	`}`
`50`	`50`
	`51`	`+tasks.named("updateDependencies") {`
	`52`	`+ // we aren't Gradle 8 compatible yet`
	`53`	`+ checkForGradleUpdate = false`
	`54`	`+}`
	`55`	`+`
`51`	`56`	`updateDependenciesSettings {`
`52`	`57`	`gitHub {`
`53`	`58`	`organization = "spring-projects"`
`@@ -59,9 +64,10 @@ updateDependenciesSettings {`
`59`	`64`	`alphaBetaVersions()`
`60`	`65`	`snapshotVersions()`
`61`	`66`	`}`
`62`		`- addFiles({`
	`67`	`+ setFiles({`
`63`	`68`	`return [`
`64`		`- project.file("gradle/dependency-management.gradle")`
	`69`	`+ project.file("gradle/dependency-management.gradle"),`
	`70`	`+ project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")`
`65`	`71`	`]`
`66`	`72`	`})`
`67`	`73`	`}`