root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

This commit is contained in:
Andy Wilkinson 2021-03-09 11:11:46 +00:00
parent dace7bb742 3e9341fbb4
commit 9be36f3a72
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -2788,15 +2788,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. 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: 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:
spring.mvc.pathmatch.use-suffix-pattern=true 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: 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: spring:
mvc: mvc:

2
spring-boot-project/spring-boot-parent/build.gradle
View File

@ -148,7 +148,7 @@ bom {
] ]
} }
} }
library("Spring Asciidoctor Extensions", "0.5.0") { library("Spring Asciidoctor Extensions", "0.5.1-SNAPSHOT") {
group("io.spring.asciidoctor") { group("io.spring.asciidoctor") {
modules = [ modules = [
"spring-asciidoctor-extensions-block-switch", "spring-asciidoctor-extensions-block-switch",