Merge branch '6.1.x'

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

@@ -30,7 +30,6 @@ import java.util.stream.Stream;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -751,7 +750,7 @@ public class TypeDescriptor implements Serializable {
 
 		private final Annotation[] annotations;
 
-		private AnnotatedElementAdapter(@NonNull Annotation[] annotations) {
+		private AnnotatedElementAdapter(Annotation[] annotations) {
 			this.annotations = annotations;
 		}
 

spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -21,10 +21,10 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.springframework.core.metrics.StartupStep;
-import org.springframework.lang.NonNull;
 
 /**
  * {@link StartupStep} implementation for the Java Flight Recorder.
+ *
  * <p>This variant delegates to a {@link FlightRecorderStartupEvent JFR event extension}
  * to collect and record data in Java Flight Recorder.
  *
@@ -114,12 +114,12 @@ class FlightRecorderStartupStep implements StartupStep {
 			add(key, value.get());
 		}
 
-		@NonNull
 		@Override
 		public Iterator<Tag> iterator() {
 			return new TagsIterator();
 		}
 
+
 		private class TagsIterator implements Iterator<Tag> {
 
 			private int idx = 0;