spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 02:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+2 -1
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.