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

@@ -151,7 +151,7 @@ abstract class AbstractDevToolsDataSourceAutoConfigurationTests {
static class DataSourceSpyConfiguration {
@Bean
DataSourceSpyBeanPostProcessor dataSourceSpyBeanPostProcessor() {
static DataSourceSpyBeanPostProcessor dataSourceSpyBeanPostProcessor() {
return new DataSourceSpyBeanPostProcessor();
}