Merge branch '2.3.x'

Closes gh-24404
2020-12-08 12:13:02 -08:00
parent 93d83342d2 11f285bde5
commit cd5ff6e4af
4 changed files with 4 additions and 5 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
@@ -1171,7 +1171,7 @@ class WebMvcAutoConfigurationTests {
 		private int exceptionResolvers = 0;

 		@Bean
-		WebMvcRegistrations webMvcRegistrationsHandlerAdapter() {
+		WebMvcRegistrations webMvcRegistrationsExceptionResolver() {
 			return new WebMvcRegistrations() {

 				@Override