Merge branch '2.1.x'

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

@@ -139,7 +139,7 @@
 		<mysql.version>8.0.13</mysql.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
 		<neo4j-ogm.version>3.1.5</neo4j-ogm.version>
-		<netty.version>4.1.32.Final</netty.version>
+		<netty.version>4.1.31.Final</netty.version>
 		<netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
 		<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
 		<pooled-jms-version>1.0.3</pooled-jms-version>