Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start building against Spring Batch 5.0.0-RC2 snapshots

Browse Source 
See gh-32935
This commit is contained in:
Andy Wilkinson
2022-11-01 11:41:48 +00:00
parent ea0ebe54e3
commit 61c9a1540f
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java
View File

@@ -20,7 +20,6 @@ import java.util.List;
import javax.sql.DataSource;
import org.springframework.boot.jdbc.DatabaseDriver;
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
import org.springframework.boot.sql.init.DatabaseInitializationSettings;
@@ -78,7 +77,6 @@ public class BatchDataSourceScriptDatabaseInitializer extends DataSourceScriptDa
private static List<String> resolveSchemaLocations(DataSource dataSource, BatchProperties.Jdbc properties) {
PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver();
platformResolver = platformResolver.withDriverPlatform(DatabaseDriver.MARIADB, "mysql");
if (StringUtils.hasText(properties.getPlatform())) {
return platformResolver.resolveAll(properties.getPlatform(), properties.getSchema());
}

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java
View File

@@ -88,8 +88,9 @@ class BatchDataSourceScriptDatabaseInitializerTests {
.map((resource) -> resource.getFilename()).filter((resourceName) -> !resourceName.contains("-drop-"))
.toList();
assertThat(schemaNames).containsExactlyInAnyOrder("schema-derby.sql", "schema-sqlserver.sql",
"schema-mysql.sql", "schema-sqlite.sql", "schema-postgresql.sql", "schema-hana.sql",
"schema-oracle.sql", "schema-db2.sql", "schema-hsqldb.sql", "schema-sybase.sql", "schema-h2.sql");
"schema-mariadb.sql", "schema-mysql.sql", "schema-sqlite.sql", "schema-postgresql.sql",
"schema-hana.sql", "schema-oracle.sql", "schema-db2.sql", "schema-hsqldb.sql", "schema-sybase.sql",
"schema-h2.sql");
}
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1421,7 +1421,7 @@ bom {
]
}
}
library("Spring Batch", "5.0.0-RC1") {
library("Spring Batch", "5.0.0-SNAPSHOT") {
group("org.springframework.batch") {
imports = [
"spring-batch-bom"