Merge branch '3.2.x'

Closes gh-40441
This commit is contained in:
Andy Wilkinson 2024-04-19 10:58:06 +01:00
commit f25dc86a3a

View File

@ -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)