Skip to content

Commit 2f54198

Browse files
committed
Merge pull request #27348 from izeye
* gh-27348: Remove Flyway references from DependsOn BFPPs for Liquibase Closes gh-27348
2 parents 7a23a12 + 198e40c commit 2f54198

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ JobRepositoryDependsOnBeanFactoryPostProcessor flywayJobRepositoryDependsOnBeanF
138138
@Bean
139139
@ConditionalOnClass(name = "liquibase.integration.spring.SpringLiquibase")
140140
JobRepositoryDependsOnBeanFactoryPostProcessor liquibaseJobRepositoryDependsOnBeanFactoryPostProcessor() {
141-
return new JobRepositoryDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class,
142-
SpringLiquibase.class);
141+
return new JobRepositoryDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
143142
}
144143

145144
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor flywayJdbcIndexedS
104104
@Bean
105105
@ConditionalOnClass(name = "liquibase.integration.spring.SpringLiquibase")
106106
JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor liquibaseJdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor() {
107-
return new JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class,
108-
SpringLiquibase.class);
107+
return new JdbcIndexedSessionRepositoryDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
109108
}
110109

111110
}

0 commit comments

Comments
 (0)