Merge branch '3.0.x'

Closes gh-35173
This commit is contained in:
Andy Wilkinson
2023-04-26 12:48:50 +01:00
20 changed files with 681 additions and 206 deletions

View File

@@ -110,7 +110,7 @@ class ConfigurationPropertiesReportEndpointProxyTests {
}
@Bean
MethodValidationPostProcessor testPostProcessor() {
static MethodValidationPostProcessor testPostProcessor() {
return new MethodValidationPostProcessor();
}

View File

@@ -70,7 +70,7 @@ class BaseConfiguration {
}
@Bean
PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
return new PropertySourcesPlaceholderConfigurer();
}