root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-22677
This commit is contained in:
Andy Wilkinson 2020-07-30 18:07:14 +01:00
parent fae4f5e36a f81e8909fa
commit 95f76d68af
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -4185,7 +4185,8 @@ The following examples shows how to set some PostgreSQL connection options:
} }
---- ----
When a `ConnectionFactory` bean is available, the regular jdbc `DataSource` auto-configuration backs off. When a `ConnectionFactory` bean is available, the regular JDBC `DataSource` auto-configuration backs off.
If you want to retain the JDBC `DataSource` auto-configuration, and are comfortable with the risk of using the blocking JDBC API in a reactive application, add `@Import(DataSourceAutoConfiguration.class)` on a `@Configuration` class in your application to re-enable it.