diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index b69baa9acfe..e28a6fb54b2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -233,7 +233,7 @@ class BatchAutoConfigurationTests { .withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, HibernateJpaAutoConfiguration.class) .withPropertyValues("spring.datasource.generate-unique-name=true", - "spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql", + "spring.batch.jdbc.schema:classpath:batch/custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_") .run(assertCustomTablePrefix()); } @@ -245,8 +245,7 @@ class BatchAutoConfigurationTests { .withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, HibernateJpaAutoConfiguration.class) .withPropertyValues("spring.datasource.generate-unique-name=true", - "spring.batch.schema:classpath:batch/custom-schema-hsql.sql", - "spring.batch.tablePrefix:PREFIX_") + "spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_") .run(assertCustomTablePrefix()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java index 2a7562919e7..5c85ac7b832 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ class BatchAutoConfigurationWithoutJpaTests { void jdbcWithCustomPrefix() { this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.datasource.generate-unique-name=true", - "spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql", + "spring.batch.jdbc.schema:classpath:batch/custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_") .run(assertCustomPrefix()); } @@ -85,8 +85,7 @@ class BatchAutoConfigurationWithoutJpaTests { void jdbcWithCustomPrefixWithDeprecatedProperties() { this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class) .withPropertyValues("spring.datasource.generate-unique-name=true", - "spring.batch.schema:classpath:batch/custom-schema-hsql.sql", - "spring.batch.tablePrefix:PREFIX_") + "spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_") .run(assertCustomPrefix()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema-hsql.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql similarity index 98% rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema-hsql.sql rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql index 4ce9dc78abf..0027a4de38e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema-hsql.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql @@ -1,5 +1,3 @@ --- Autogenerated: do not edit this file - CREATE TABLE PREFIX_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT ,