Merge branch '2.4.x'

spring-projects · Mar 9, 2021 · 99b7d29 · 99b7d29
2 parents 06b751a + 9be36f3
commit 99b7d29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@@ -2462,15 +2462,19 @@ Most standard media types are supported out-of-the-box, but you can also define
 Suffix pattern matching is deprecated and will be removed in a future release.
 If you understand the caveats and would still like your application to use suffix pattern matching, the following configuration is required:
 
-[source,properties,indent=0,subs="verbatim,quotes,attributes"]
+[source,yaml,indent=0,subs="verbatim,quotes,attributes",configblocks]
 ----
-	spring.mvc.contentnegotiation.favor-path-extension=true
-	spring.mvc.pathmatch.use-suffix-pattern=true
+	spring:
+	  mvc:
+	    contentnegotiation:
+	      favor-path-extension: true
+	    pathmatch:
+	      use-suffix-pattern: true
 ----
 
 Alternatively, rather than open all suffix patterns, it's more secure to only support registered suffix patterns:
 
-[source,yaml,indent=0,subs="verbatim,quotes,attributes",configprops,configblocks]
+[source,yaml,indent=0,subs="verbatim,quotes,attributes",configblocks]
 ----
 	spring:
 	  mvc:

diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle
@@ -148,7 +148,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Asciidoctor Extensions", "0.5.0") {
+	library("Spring Asciidoctor Extensions", "0.5.1-SNAPSHOT") {
 		group("io.spring.asciidoctor") {
 			modules = [
 				"spring-asciidoctor-extensions-spring-boot"