Refined exclusion of bridge methods in annotation post-processors (for Java 8 compatibility)

Issue: SPR-12187
(cherry picked from commit 29abca5)

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -391,10 +391,15 @@ private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
 				}
 			}
 			for (Method method : targetClass.getDeclaredMethods()) {
+				AnnotationAttributes ann = null;
 				Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
-				AnnotationAttributes ann = BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod) ?
-						findAutowiredAnnotation(bridgedMethod) : findAutowiredAnnotation(method);
-				if (ann != null && !method.isBridge() && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+				if (BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
+					ann = findAutowiredAnnotation(bridgedMethod);
+				}
+				else if (!method.isBridge()) {
+					ann = findAutowiredAnnotation(method);
+				}
+				if (ann != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
 					if (Modifier.isStatic(method.getModifiers())) {
 						if (logger.isWarnEnabled()) {
 							logger.warn("Autowired annotation is not supported on static methods: " + method);