spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 14:09:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# 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
This commit is contained in:
Juergen Hoeller
2025-10-21 01:04:38 +02:00
parent aa625f0ba9 7adcd99ea2
commit 687fc935a8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
+1 -2
View File
@@ -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();
}
}
}
}