Merge branch '6.0.x'

Author: sbrannen

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

@@ -58,7 +58,7 @@ final class AnnotationTypeMapping {
 	/**
 	 * Set used to track which convention-based annotation attribute overrides
 	 * have already been checked. Each key is the combination of the fully
-	 * qualified class names of a composed annotation and a meta-annotation
+	 * qualified class name of a composed annotation and a meta-annotation
 	 * that it is either present or meta-present on the composed annotation,
 	 * separated by a dash.
 	 * @since 6.0
@@ -319,7 +319,7 @@ private void addConventionMappings() {
 				logger.isWarnEnabled()) {
 			logger.warn("""
 					Support for convention-based annotation attribute overrides is deprecated \
-					and will be removed in Spring Framework 6.1. Please annotate the following \
+					and will be removed in Spring Framework 6.2. Please annotate the following \
 					attributes in @%s with appropriate @AliasFor declarations: %s"""
 						.formatted(rootAnnotationTypeName, conventionMappedAttributes));
 		}