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}
+		 * {@link Scheduler} beans depend on any beans that perform data source
-		 * bean(s).
+		 * initialization.
 		 */
 		@Configuration(proxyBeanMethods = false)
 		static class QuartzSchedulerDependencyConfiguration {
@@ -150,10 +150,16 @@ public class QuartzAutoConfiguration {
 				return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
 			}
 
-			@Bean
+			@Configuration(proxyBeanMethods = false)
-			@ConditionalOnBean(SpringLiquibase.class)
+			@ConditionalOnClass(SpringLiquibase.class)
-			static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
+			static class LiquibaseQuartzSchedulerDependencyConfiguration {
-				return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
+
+				@Bean
+				@ConditionalOnBean(SpringLiquibase.class)
+				static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
+					return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
+				}
+
 			}
 
 		}