Merge branch 'main' into 4.0.x

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1207,6 +1207,13 @@ bom {
 			contains ".BETA"
 			because "we don't want betas"
 		}
+		alignWith {
+			property {
+				name "lettuce"
+				of "org.springframework.data:spring-data-redis"
+				managedBy "Spring Data Bom"
+			}
+		}
 		group("io.lettuce") {
 			modules = [
 				"lettuce-core"