Merge branch '5.2.x'

spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,6 +151,9 @@ abstract class AnnotationsScanner {
 					return result;
 				}
 				if (isFiltered(source, context, classFilter)) {
+					// Skip the current level in the class hierarchy.
+					source = source.getSuperclass();
+					aggregateIndex++;
 					continue;
 				}
 				Annotation[] declaredAnnotations =