Merge branch '1.5.x'

# Conflicts:
#	spring-boot-project/spring-boot-dependencies/pom.xml

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

@@ -66,7 +66,7 @@
 		<htmlunit.version>2.29</htmlunit.version>
 		<httpasyncclient.version>4.1.3</httpasyncclient.version>
 		<httpclient.version>4.5.4</httpclient.version>
-		<httpcore.version>4.4.8</httpcore.version>
+		<httpcore.version>4.4.9</httpcore.version>
 		<infinispan.version>9.1.4.Final</infinispan.version>
 		<influxdb-java.version>2.8</influxdb-java.version>
 		<jackson.version>2.9.2</jackson.version>
@@ -110,7 +110,7 @@
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.10.0</log4j2.version>
 		<logback.version>1.2.3</logback.version>
-		<lombok.version>1.16.18</lombok.version>
+		<lombok.version>1.16.20</lombok.version>
 		<mariadb.version>2.2.1</mariadb.version>
 		<micrometer.version>1.0.0-rc.7</micrometer.version>
 		<mssql-jdbc.version>6.2.2.jre8</mssql-jdbc.version>
@@ -166,7 +166,7 @@
 		<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
 		<tomcat.version>8.5.24</tomcat.version>
-		<undertow.version>1.4.21.Final</undertow.version>
+		<undertow.version>1.4.22.Final</undertow.version>
 		<unboundid-ldapsdk.version>4.0.3</unboundid-ldapsdk.version>
 		<webjars-hal-browser.version>3325375</webjars-hal-browser.version>
 		<webjars-locator.version>0.32-1</webjars-locator.version>