Merge branch '2.7.x'

Closes gh-31529
2022-06-24 18:01:31 +01:00
parent 06281e2d72 7abc7df7b8
commit a28ca4594b
9 changed files with 48 additions and 27 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc
@@ -205,7 +205,6 @@ The following example shows setting SSL properties using PEM-encoded certificate
 	    certificate: "classpath:my-cert.crt"
 	    certificate-private-key: "classpath:my-cert.key"
 	    trust-certificate: "classpath:ca-cert.crt"
-	    key-store-password: "secret"
 ----

 See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.