Merge branch '6.2.x'

2025-04-14 11:32:48 +02:00
parent 6ade8c5a41 7095f4cb66
commit 23aea5c402
39 changed files with 560 additions and 565 deletions
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandlerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandlerTests.java
@@ -126,7 +126,7 @@ class MockitoBeanOverrideHandlerTests {
 	/**
 	 * Since the "field name as fallback qualifier" is not available for an annotated class,
 	 * what would seem to be "equivalent" handlers are actually not considered "equal" when
-	 * the the lookup is "by type".
+	 * the lookup is "by type".
 	 */
 	@Test  // gh-33925
 	void isNotEqualToWithSameByTypeLookupMetadataFromFieldAndClassLevel() {