Merge branch '6.2.x'

2025-01-03 17:29:14 +02:00
parent bab8a8300b 0da4ae96b4
commit 087641c508
9 changed files with 46 additions and 46 deletions
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java
@@ -113,7 +113,7 @@ public class TestBeanTests {
 	}

 	@Test
-	void contextCustomizerCannotBeCreatedWitCompetingOverrideMethods() {
+	void contextCustomizerCannotBeCreatedWithCompetingOverrideMethods() {
 		GenericApplicationContext context = new GenericApplicationContext();
 		context.registerBean("bean", String.class, () -> "example");
 		assertThatIllegalStateException()