Commit 339b21ce authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.3.x'

Closes gh-23992
parents fb59432c 1e9c9b9d
...@@ -204,6 +204,10 @@ ...@@ -204,6 +204,10 @@
"name": "server.servlet.session.tracking-modes", "name": "server.servlet.session.tracking-modes",
"description": "Session tracking modes." "description": "Session tracking modes."
}, },
{
"name": "server.shutdown",
"defaultValue": "immediate"
},
{ {
"name": "server.ssl.ciphers", "name": "server.ssl.ciphers",
"description": "Supported SSL ciphers." "description": "Supported SSL ciphers."
...@@ -266,9 +270,6 @@ ...@@ -266,9 +270,6 @@
"name": "server.ssl.trust-store-type", "name": "server.ssl.trust-store-type",
"description": "Type of the trust store." "description": "Type of the trust store."
}, },
{ "name": "server.shutdown",
"defaultValue:": "immediate"
},
{ {
"name": "server.tomcat.max-http-post-size", "name": "server.tomcat.max-http-post-size",
"type": "org.springframework.util.unit.DataSize", "type": "org.springframework.util.unit.DataSize",
...@@ -1316,6 +1317,10 @@ ...@@ -1316,6 +1317,10 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "spring.kafka.consumer.isolation-level",
"defaultValue": "read-uncommitted"
},
{ {
"name": "spring.kafka.consumer.ssl.keystore-location", "name": "spring.kafka.consumer.ssl.keystore-location",
"type": "org.springframework.core.io.Resource", "type": "org.springframework.core.io.Resource",
...@@ -1510,6 +1515,14 @@ ...@@ -1510,6 +1515,14 @@
"name": "spring.mvc.locale-resolver", "name": "spring.mvc.locale-resolver",
"defaultValue": "accept-header" "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", "name": "spring.neo4j.uri",
"defaultValue": "bolt://localhost:7687" "defaultValue": "bolt://localhost:7687"
...@@ -1663,6 +1676,10 @@ ...@@ -1663,6 +1676,10 @@
"name": "spring.thymeleaf.suffix", "name": "spring.thymeleaf.suffix",
"defaultValue": ".html" "defaultValue": ".html"
}, },
{
"name": "spring.web.locale-resolver",
"defaultValue": "accept-header"
},
{ {
"name": "spring.webflux.hiddenmethod.filter.enabled", "name": "spring.webflux.hiddenmethod.filter.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment