mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Start building against Spring Batch 5.0.0-RC2 snapshots
See gh-32935
This commit is contained in:
parent
ea0ebe54e3
commit
61c9a1540f
@ -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());
|
||||
}
|
||||
|
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user