Merge branch '2.1.x'

Closes gh-18165

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

@@ -133,8 +133,8 @@ public class QuartzAutoConfiguration {
 
 		/**
 		 * Additional configuration to ensure that {@link SchedulerFactoryBean} and
-		 * {@link Scheduler} beans depend on the {@link QuartzDataSourceInitializer}
-		 * bean(s).
+		 * {@link Scheduler} beans depend on any beans that perform data source
+		 * initialization.
 		 */
 		@Configuration(proxyBeanMethods = false)
 		static class QuartzSchedulerDependencyConfiguration {
@@ -150,6 +150,10 @@ public class QuartzAutoConfiguration {
 				return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
 			}
 
+			@Configuration(proxyBeanMethods = false)
+			@ConditionalOnClass(SpringLiquibase.class)
+			static class LiquibaseQuartzSchedulerDependencyConfiguration {
+
 				@Bean
 				@ConditionalOnBean(SpringLiquibase.class)
 				static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
@@ -160,6 +164,8 @@ public class QuartzAutoConfiguration {
 
 		}
 
+	}
+
 	/**
 	 * {@link AbstractDependsOnBeanFactoryPostProcessor} for Quartz {@link Scheduler} and
 	 * {@link SchedulerFactoryBean}.