Browse Source

Merge branch '3.1.x' into 3.2.x

Closes gh-40440
pull/40554/head
Andy Wilkinson 2 years ago
parent
commit
c55f136c2a
  1. 1
      spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

1
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

@ -57,6 +57,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; @@ -57,6 +57,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
* @author Andy Wilkinson
* @since 1.3.3
*/
@ConditionalOnClass(DataSource.class)
@Conditional({ OnEnabledDevToolsCondition.class, DevToolsDataSourceCondition.class })
@AutoConfiguration(after = DataSourceAutoConfiguration.class)
@Import(DatabaseShutdownExecutorEntityManagerFactoryDependsOnPostProcessor.class)

Loading…
Cancel
Save