spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 03:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51890
This commit is contained in:
Stéphane Nicoll
2026-09-28 13:16:33 +02:00
parent 708a58c2cf 9e93588936
commit 3af085d914
6 changed files with 146 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
+1 -1
View File
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
* @author Andy Wilkinson
* @since 1.3.3
*/
@ConditionalOnClass(DataSource.class)
@ConditionalOnClass({ DataSource.class, DataSourceProperties.class })
@ConditionalOnEnabledDevTools
@Conditional(DevToolsDataSourceCondition.class)
@AutoConfiguration(afterName = "org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration")
module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfiguration.java
+1 -1
View File
@@ -51,7 +51,7 @@ import org.springframework.util.Assert;
* @author Phillip Webb
* @since 2.5.6
*/
@ConditionalOnClass(ConnectionFactory.class)
@ConditionalOnClass({ ConnectionFactory.class, R2dbcAutoConfiguration.class })
@ConditionalOnEnabledDevTools
@Conditional(DevToolsConnectionFactoryCondition.class)
@AutoConfiguration(afterName = "org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration")