Merge branch '2.7.x'

Closes gh-31922
This commit is contained in:
Stephane Nicoll
2022-07-29 14:44:02 +02:00
6 changed files with 51 additions and 1 deletions

View File

@@ -240,7 +240,7 @@ class DataSourceAutoConfigurationTests {
private static Function<ApplicationContextRunner, ApplicationContextRunner> hideConnectionPools() {
return (runner) -> runner.withClassLoader(new FilteredClassLoader("org.apache.tomcat", "com.zaxxer.hikari",
"org.apache.commons.dbcp2", "oracle.ucp.jdbc"));
"org.apache.commons.dbcp2", "oracle.ucp.jdbc", "com.mchange"));
}
private <T extends DataSource> void assertDataSource(Class<T> expectedType, List<String> hiddenPackages,