Merge branch '6.0.x'

spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@@ -131,6 +131,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 	}
 
 	@Test
+	@SuppressWarnings("rawtypes")
 	void resourceInjectionWithNullBean() {
 		RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);