Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 3d2e0f38a766 · 2022-11-21T12:00:54.000Z
Closes gh-33134
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1765,10 +1765,7 @@ bom {
 			]
 		}
 	}
-	library("Spring RESTDocs", "2.0.7.BUILD-SNAPSHOT") {
-		prohibit("[3.0.0-M1,)") {
-			because "it uses Spring Framework 6"
-		}
+	library("Spring RESTDocs", "2.0.7.RELEASE") {
 		group("org.springframework.restdocs") {
 			modules = [
 				"spring-restdocs-asciidoctor",

Original file line number	Diff line number	Diff line change
`@@ -1765,10 +1765,7 @@ bom {`
`1765`	`1765`	`]`
`1766`	`1766`	`}`
`1767`	`1767`	`}`
`1768`		`- library("Spring RESTDocs", "2.0.7.BUILD-SNAPSHOT") {`
`1769`		`- prohibit("[3.0.0-M1,)") {`
`1770`		`- because "it uses Spring Framework 6"`
`1771`		`- }`
	`1768`	`+ library("Spring RESTDocs", "2.0.7.RELEASE") {`
`1772`	`1769`	`group("org.springframework.restdocs") {`
`1773`	`1770`	`modules = [`
`1774`	`1771`	`"spring-restdocs-asciidoctor",`