Merge branch '2.7.x' into 3.0.x

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

View File

@@ -244,7 +244,7 @@ class RedisAutoConfigurationJedisTests {
static class JedisConnectionFactoryCaptorConfiguration {
@Bean
JedisConnectionFactoryCaptor jedisConnectionFactoryCaptor() {
static JedisConnectionFactoryCaptor jedisConnectionFactoryCaptor() {
return new JedisConnectionFactoryCaptor();
}

View File

@@ -388,7 +388,7 @@ class ValidationAutoConfigurationTests {
static class SampleConfiguration {
@Bean
MethodValidationPostProcessor testMethodValidationPostProcessor() {
static MethodValidationPostProcessor testMethodValidationPostProcessor() {
return new MethodValidationPostProcessor();
}