From 198e40c72e689f6ee691549fead8c403357a0b27 Mon Sep 17 00:00:00 2001 From: izeye Date: Thu, 15 Jul 2021 22:35:31 +0900 Subject: [PATCH] Remove Flyway references from DependsOn BFPPs for Liquibase See gh-27348 --- .../boot/autoconfigure/batch/BatchAutoConfiguration.java | 3 +-- .../boot/autoconfigure/session/JdbcSessionConfiguration.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index 0cd8f94712..76f36480a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -138,8 +138,7 @@ public class BatchAutoConfiguration { @Bean @ConditionalOnClass(name = "liquibase.integration.spring.SpringLiquibase") JobRepositoryDependsOnBeanFactoryPostProcessor liquibaseJobRepositoryDependsOnBeanFactoryPostProcessor() { - return new JobRepositoryDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class, - SpringLiquibase.class); + return new JobRepositoryDependsOnBeanFactoryPostProcessor(SpringLiquibase.class); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java index 38cd8b25dc..98907bd719 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java @@ -104,8 +104,7 @@ class JdbcSessionConfiguration { @Bean @ConditionalOnClass(name = "liquibase.integration.spring.SpringLiquibase") JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor liquibaseJdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor() { - return new JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class, - SpringLiquibase.class); + return new JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor(SpringLiquibase.class); } }