Commit 19ccfaea authored by Andy Wilkinson's avatar Andy Wilkinson

Fix QuartzAutoConfiguration when Liquibase is not on the class path

Fixes gh-18153
parent 8882c532
...@@ -166,8 +166,8 @@ public class QuartzAutoConfiguration { ...@@ -166,8 +166,8 @@ public class QuartzAutoConfiguration {
/** /**
* Additional configuration to ensure that {@link SchedulerFactoryBean} and * Additional configuration to ensure that {@link SchedulerFactoryBean} and
* {@link Scheduler} beans depend on the {@link QuartzDataSourceInitializer} * {@link Scheduler} beans depend on any beans that perform data source
* bean(s). * initialization.
*/ */
@Configuration @Configuration
static class QuartzSchedulerDependencyConfiguration { static class QuartzSchedulerDependencyConfiguration {
...@@ -183,10 +183,16 @@ public class QuartzAutoConfiguration { ...@@ -183,10 +183,16 @@ public class QuartzAutoConfiguration {
return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class); return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
} }
@Bean @Configuration
@ConditionalOnBean(SpringLiquibase.class) @ConditionalOnClass(SpringLiquibase.class)
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() { static class LiquibaseQuartzSchedulerDependencyConfiguration {
return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
@Bean
@ConditionalOnBean(SpringLiquibase.class)
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment