Merge branch '5.2.x'

Author: sbrannen

spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.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.
@@ -211,7 +211,7 @@ public Iterator<MergedAnnotation<Annotation>> iterator() {
 	@Override
 	public Spliterator<MergedAnnotation<Annotation>> spliterator() {
 		if (this.annotationFilter == AnnotationFilter.ALL) {
-			return Collections.<MergedAnnotation<Annotation>> emptyList().spliterator();
+			return Spliterators.emptySpliterator();
 		}
 		return spliterator(null);
 	}