Merge branch '5.3.x'

# Conflicts:
#	build.gradle
#	spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
#	spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
This commit is contained in:
Juergen Hoeller
2021-12-15 18:03:51 +01:00
3 changed files with 5 additions and 4 deletions

View File

@@ -161,6 +161,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata {
return Collections.unmodifiableSet(this.declaredMethods);
}
@Override
public boolean equals(@Nullable Object obj) {
return ((this == obj) || ((obj instanceof SimpleAnnotationMetadata) &&