Merge branch '2.2.x'

Closes gh-19474

Author: snicoll

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -207,7 +207,7 @@
 		<thymeleaf-layout-dialect.version>2.4.1</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
-		<tomcat.version>9.0.29</tomcat.version>
+		<tomcat.version>9.0.30</tomcat.version>
 		<unboundid-ldapsdk.version>4.0.13</unboundid-ldapsdk.version>
 		<undertow.version>2.0.28.Final</undertow.version>
 		<webjars-hal-browser.version>3325375</webjars-hal-browser.version>