mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '3.1.x' into 3.2.x
Closes gh-40440
This commit is contained in:
commit
c55f136c2a
@ -57,6 +57,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
|
|||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 1.3.3
|
* @since 1.3.3
|
||||||
*/
|
*/
|
||||||
|
@ConditionalOnClass(DataSource.class)
|
||||||
@Conditional({ OnEnabledDevToolsCondition.class, DevToolsDataSourceCondition.class })
|
@Conditional({ OnEnabledDevToolsCondition.class, DevToolsDataSourceCondition.class })
|
||||||
@AutoConfiguration(after = DataSourceAutoConfiguration.class)
|
@AutoConfiguration(after = DataSourceAutoConfiguration.class)
|
||||||
@Import(DatabaseShutdownExecutorEntityManagerFactoryDependsOnPostProcessor.class)
|
@Import(DatabaseShutdownExecutorEntityManagerFactoryDependsOnPostProcessor.class)
|
||||||
|
Loading…
Reference in New Issue
Block a user