Merge branch '3.2.x' into 3.3.x

philwebb · philwebb · commit 4753ee000cdb · 2024-11-14T10:32:27.000-08:00
Closes gh-43167
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -558,7 +558,11 @@ bom {
 			javadoc("https://javadoc.io/doc/com.zaxxer/HikariCP/{version}", "com.zaxxer.hikari")
 		}
 	}
-	library("HSQLDB", "2.7.4") {
+	library("HSQLDB", "2.7.3") {
+		prohibit {
+			versionRange "[2.7.4]"
+			because "it contains a bug that breaks Spring Data (https://sourceforge.net/p/hsqldb/bugs/1725/)"
+		}
 		group("org.hsqldb") {
 			modules = [
 				"hsqldb"

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,11 @@ bom {`
`558`	`558`	`javadoc("https://javadoc.io/doc/com.zaxxer/HikariCP/{version}", "com.zaxxer.hikari")`
`559`	`559`	`}`
`560`	`560`	`}`
`561`		`- library("HSQLDB", "2.7.4") {`
	`561`	`+ library("HSQLDB", "2.7.3") {`
	`562`	`+ prohibit {`
	`563`	`+ versionRange "[2.7.4]"`
	`564`	`+ because "it contains a bug that breaks Spring Data (https://sourceforge.net/p/hsqldb/bugs/1725/)"`
	`565`	`+ }`
`562`	`566`	`group("org.hsqldb") {`
`563`	`567`	`modules = [`
`564`	`568`	`"hsqldb"`