Merge branch '2.3.x'

Closes gh-23992
This commit is contained in:
Stephane Nicoll 2020-11-02 10:48:32 +01:00
commit 339b21cee7
1 changed files with 20 additions and 3 deletions

View File

@ -204,6 +204,10 @@
"name": "server.servlet.session.tracking-modes",
"description": "Session tracking modes."
},
{
"name": "server.shutdown",
"defaultValue": "immediate"
},
{
"name": "server.ssl.ciphers",
"description": "Supported SSL ciphers."
@ -266,9 +270,6 @@
"name": "server.ssl.trust-store-type",
"description": "Type of the trust store."
},
{ "name": "server.shutdown",
"defaultValue:": "immediate"
},
{
"name": "server.tomcat.max-http-post-size",
"type": "org.springframework.util.unit.DataSize",
@ -1316,6 +1317,10 @@
"level": "error"
}
},
{
"name": "spring.kafka.consumer.isolation-level",
"defaultValue": "read-uncommitted"
},
{
"name": "spring.kafka.consumer.ssl.keystore-location",
"type": "org.springframework.core.io.Resource",
@ -1510,6 +1515,14 @@
"name": "spring.mvc.locale-resolver",
"defaultValue": "accept-header"
},
{
"name": "spring.mvc.pathmatch.matching-strategy",
"defaultValue": "ant-path-matcher"
},
{
"name": "spring.neo4j.security.trust-strategy",
"defaultValue": "trust-system-ca-signed-certificates"
},
{
"name": "spring.neo4j.uri",
"defaultValue": "bolt://localhost:7687"
@ -1663,6 +1676,10 @@
"name": "spring.thymeleaf.suffix",
"defaultValue": ".html"
},
{
"name": "spring.web.locale-resolver",
"defaultValue": "accept-header"
},
{
"name": "spring.webflux.hiddenmethod.filter.enabled",
"type": "java.lang.Boolean",