Skip to content

Commit 19ccfae

Browse files
committed
Fix QuartzAutoConfiguration when Liquibase is not on the class path
Fixes spring-projectsgh-18153
1 parent 8882c53 commit 19ccfae

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

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

+12-6
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ public QuartzDataSourceInitializer quartzDataSourceInitializer(DataSource dataSo
166166

167167
/**
168168
* Additional configuration to ensure that {@link SchedulerFactoryBean} and
169-
* {@link Scheduler} beans depend on the {@link QuartzDataSourceInitializer}
170-
* bean(s).
169+
* {@link Scheduler} beans depend on any beans that perform data source
170+
* initialization.
171171
*/
172172
@Configuration
173173
static class QuartzSchedulerDependencyConfiguration {
@@ -183,10 +183,16 @@ public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerFlywayDe
183183
return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
184184
}
185185

186-
@Bean
187-
@ConditionalOnBean(SpringLiquibase.class)
188-
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
189-
return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
186+
@Configuration
187+
@ConditionalOnClass(SpringLiquibase.class)
188+
static class LiquibaseQuartzSchedulerDependencyConfiguration {
189+
190+
@Bean
191+
@ConditionalOnBean(SpringLiquibase.class)
192+
public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
193+
return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
194+
}
195+
190196
}
191197

192198
}

0 commit comments

Comments
 (0)