Merge branch '6.2.x'

spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java

@@ -104,7 +104,7 @@ class SpringHandlerInstantiatorTests {
 	}
 
 	@Test
-	void applicationContextAwaretypeResolverBuilder() throws JsonProcessingException {
+	void applicationContextAwareTypeResolverBuilder() throws JsonProcessingException {
 		this.objectMapper.writeValueAsString(new Group());
 		assertThat(CustomTypeResolverBuilder.isAutowiredFiledInitialized).isTrue();
 	}