Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 83932cfe9413 · 2022-06-22T20:54:56.000+01:00
Closes spring-projectsgh-31483
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1715,7 +1715,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Integration", "5.5.12") {
+	library("Spring Integration", "5.5.13") {
 		prohibit("[6.0.0-M1,)") {
 			because "it uses Spring Framework 6"
 		}

Original file line number	Diff line number	Diff line change
`@@ -1715,7 +1715,7 @@ bom {`
`1715`	`1715`	`]`
`1716`	`1716`	`}`
`1717`	`1717`	`}`
`1718`		`- library("Spring Integration", "5.5.12") {`
	`1718`	`+ library("Spring Integration", "5.5.13") {`
`1719`	`1719`	`prohibit("[6.0.0-M1,)") {`
`1720`	`1720`	`because "it uses Spring Framework 6"`
`1721`	`1721`	`}`