Merge branch '2.3.x'

wilkinsona · wilkinsona · commit 95f76d68af78 · 2020-07-30T18:07:14.000+01:00
Closes gh-22677
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@@ -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.
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -4185,7 +4185,8 @@ The following examples shows how to set some PostgreSQL connection options:`
`4185`	`4185`	`}`
`4186`	`4186`	`----`
`4187`	`4187`
`4188`		-When a `ConnectionFactory` bean is available, the regular jdbc `DataSource` auto-configuration backs off.
	`4188`	+When a `ConnectionFactory` bean is available, the regular JDBC `DataSource` auto-configuration backs off.
	`4189`	+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.
`4189`	`4190`
`4190`	`4191`
`4191`	`4192`