Browse Source

Merge branch '3.5.x' into 4.0.x

Closes gh-48703
pull/48817/head
Andy Wilkinson 3 weeks ago
parent
commit
1d67f86dc5
  1. 2
      module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java
  2. 2
      module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java

2
module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java

@ -42,7 +42,7 @@ class DataSourceBuilderRuntimeHints implements RuntimeHintsRegistrar { @@ -42,7 +42,7 @@ class DataSourceBuilderRuntimeHints implements RuntimeHintsRegistrar {
typeNames.add("com.mchange.v2.c3p0.ComboPooledDataSource");
typeNames.add("com.zaxxer.hikari.HikariDataSource");
typeNames.add("oracle.jdbc.datasource.OracleDataSource");
typeNames.add("oracle.ucp.jdbc.PoolDataSource");
typeNames.add("oracle.ucp.jdbc.PoolDataSourceImpl");
typeNames.add("org.apache.commons.dbcp2.BasicDataSource");
typeNames.add("org.apache.tomcat.jdbc.pool.DataSource");
typeNames.add("org.h2.jdbcx.JdbcDataSource");

2
module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java

@ -40,7 +40,7 @@ class DataSourceBuilderRuntimeHintsTests { @@ -40,7 +40,7 @@ class DataSourceBuilderRuntimeHintsTests {
ReflectionHints hints = registerHints();
Stream
.of(com.mchange.v2.c3p0.ComboPooledDataSource.class, com.zaxxer.hikari.HikariDataSource.class,
oracle.jdbc.datasource.OracleDataSource.class, oracle.ucp.jdbc.PoolDataSource.class,
oracle.jdbc.datasource.OracleDataSource.class, oracle.ucp.jdbc.PoolDataSourceImpl.class,
org.apache.commons.dbcp2.BasicDataSource.class, org.apache.tomcat.jdbc.pool.DataSource.class,
org.h2.jdbcx.JdbcDataSource.class, org.postgresql.ds.PGSimpleDataSource.class,
org.springframework.jdbc.datasource.SimpleDriverDataSource.class,

Loading…
Cancel
Save