Merge branch '6.2.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
#	spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -145,12 +145,12 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	private static final boolean JNDI_PRESENT = ClassUtils.isPresent(
 			"javax.naming.InitialContext", CommonAnnotationBeanPostProcessor.class.getClassLoader());
 
-	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = CollectionUtils.newLinkedHashSet(3);
-
 	private static final @Nullable Class<? extends Annotation> JAKARTA_RESOURCE_TYPE;
 
 	private static final @Nullable Class<? extends Annotation> EJB_ANNOTATION_TYPE;
 
+	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = CollectionUtils.newLinkedHashSet(2);
+
 	static {
 		JAKARTA_RESOURCE_TYPE = loadAnnotationType("jakarta.annotation.Resource");
 		if (JAKARTA_RESOURCE_TYPE != null) {

spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java

@@ -200,9 +200,9 @@ class MockServletContextTests {
 			assertThat(filterRegistrations).isNotNull();
 			assertThat(filterRegistrations).isEmpty();
 		}
-
 	}
 
+
 	/**
 	 * @since 5.1.11
 	 */
@@ -242,7 +242,6 @@ class MockServletContextTests {
 				assertThat(realPath).isNotNull();
 			}
 		}
-
 	}
 
 }