Merge branch '5.3.x'

jhoeller · jhoeller · commit 5e162881a612 · 2022-09-14T19:29:57.000+02:00
# Conflicts:
#	build.gradle
diff --git a/build.gradle b/build.gradle
@@ -87,7 +87,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "10.3.1"
+		toolVersion = "10.3.3"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ configure([rootProject] + javaProjects) { project ->`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`checkstyle {`
`90`		`- toolVersion = "10.3.1"`
	`90`	`+ toolVersion = "10.3.3"`
`91`	`91`	`configDirectory.set(rootProject.file("src/checkstyle"))`
`92`	`92`	`}`
`93`	`93`