Skip to content

Commit 2923e66

Browse files
committed
Merge pull request #45380 from quaff
* pr/45380: Stop considering "spring.batch.initialize-schema" Closes gh-45380
2 parents dd120b9 + ef5031f commit 2923e66

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ BatchDataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource d
202202
static class OnBatchDatasourceInitializationCondition extends OnDatabaseInitializationCondition {
203203

204204
OnBatchDatasourceInitializationCondition() {
205-
super("Batch", "spring.batch.jdbc.initialize-schema", "spring.batch.initialize-schema");
205+
super("Batch", "spring.batch.jdbc.initialize-schema");
206206
}
207207

208208
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ void jobRepositoryBeansDependOnBatchDataSourceInitializer() {
397397
@Test
398398
void jobRepositoryBeansDependOnFlyway() {
399399
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class)
400-
.withPropertyValues("spring.batch.initialize-schema=never")
400+
.withPropertyValues("spring.batch.jdbc.initialize-schema=never")
401401
.run((context) -> {
402402
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
403403
String[] jobRepositoryNames = beanFactory.getBeanNamesForType(JobRepository.class);
@@ -414,7 +414,7 @@ void jobRepositoryBeansDependOnFlyway() {
414414
void jobRepositoryBeansDependOnLiquibase() {
415415
this.contextRunner
416416
.withUserConfiguration(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class)
417-
.withPropertyValues("spring.batch.initialize-schema=never")
417+
.withPropertyValues("spring.batch.jdbc.initialize-schema=never")
418418
.run((context) -> {
419419
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
420420
String[] jobRepositoryNames = beanFactory.getBeanNamesForType(JobRepository.class);

0 commit comments

Comments
 (0)