Merge branch '3.1.x'

marcusdacoregio · marcusdacoregio · commit 2dae6caa7505 · 2023-07-19T09:49:27.000-03:00
diff --git a/build.gradle b/build.gradle
@@ -53,6 +53,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"
@@ -64,9 +69,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
`@@ -53,6 +53,11 @@ nohttp {`
`53`	`53`	`source.exclude "spring-session-docs/modules/ROOT/examples//build/"`
`54`	`54`	`}`
`55`	`55`
	`56`	`+tasks.named("updateDependencies") {`
	`57`	`+ // we aren't Gradle 8 compatible yet`
	`58`	`+ checkForGradleUpdate = false`
	`59`	`+}`
	`60`	`+`
`56`	`61`	`updateDependenciesSettings {`
`57`	`62`	`gitHub {`
`58`	`63`	`organization = "spring-projects"`
`@@ -64,9 +69,10 @@ updateDependenciesSettings {`
`64`	`69`	`alphaBetaVersions()`
`65`	`70`	`snapshotVersions()`
`66`	`71`	`}`
`67`		`- addFiles({`
	`72`	`+ setFiles({`
`68`	`73`	`return [`
`69`		`- project.file("gradle/dependency-management.gradle")`
	`74`	`+ project.file("gradle/dependency-management.gradle"),`
	`75`	`+ project.file("buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy")`
`70`	`76`	`]`
`71`	`77`	`})`
`72`	`78`	`}`