Merge branch '4.0.x' into 4.1.x

Closes gh-51599
This commit is contained in:
Andy Wilkinson
2026-09-07 08:26:42 +01:00
149 changed files with 5 additions and 243 deletions
@@ -83,7 +83,6 @@ class WebMvcEndpointChildContextConfigurationIntegrationTests {
"spring.web.error.include-binding-errors=always");
@TempDir
@SuppressWarnings("NullAway.Init")
Path temp;
@Test // gh-17938
@@ -62,7 +62,6 @@ class DefaultErrorViewResolverTests {
private DefaultErrorViewResolver resolver;
@Mock
@SuppressWarnings("NullAway.Init")
private TemplateAvailabilityProvider templateAvailabilityProvider;
private Resources resourcesProperties;