root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Phillip Webb 2019-09-01 18:31:27 -07:00
parent 3746631081 2be3027dcf
commit b3835a8149
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
View File

@ -141,19 +141,19 @@ public class QuartzAutoConfiguration {
static class QuartzSchedulerDependencyConfiguration { static class QuartzSchedulerDependencyConfiguration {
@Bean @Bean
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerDataSourceInitializerDependsOnBeanFactoryPostProcessor() { static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerDataSourceInitializerDependsOnBeanFactoryPostProcessor() {
return new SchedulerDependsOnBeanFactoryPostProcessor(QuartzDataSourceInitializer.class); return new SchedulerDependsOnBeanFactoryPostProcessor(QuartzDataSourceInitializer.class);
} }
@Bean @Bean
@ConditionalOnBean(FlywayMigrationInitializer.class) @ConditionalOnBean(FlywayMigrationInitializer.class)
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerFilywayDependsOnBeanFactoryPostProcessor() { static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerFilywayDependsOnBeanFactoryPostProcessor() {
return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class); return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
} }
@Bean @Bean
@ConditionalOnBean(SpringLiquibase.class) @ConditionalOnBean(SpringLiquibase.class)
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() { static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class); return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
} }