mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Switch to Spring Batch 5.0.0-SNAPSHOT
See gh-32618
This commit is contained in:
parent
6ff31fe231
commit
c8c73b195d
@ -229,7 +229,7 @@ public class JobLauncherApplicationRunner implements ApplicationRunner, Ordered,
|
||||
}
|
||||
|
||||
private JobParameters getGetIdentifying(JobParameters parameters) {
|
||||
HashMap<String, JobParameter> nonIdentifying = new LinkedHashMap<>(parameters.getParameters().size());
|
||||
HashMap<String, JobParameter<?>> nonIdentifying = new LinkedHashMap<>(parameters.getParameters().size());
|
||||
parameters.getParameters().forEach((key, value) -> {
|
||||
if (value.isIdentifying()) {
|
||||
nonIdentifying.put(key, value);
|
||||
@ -239,7 +239,7 @@ public class JobLauncherApplicationRunner implements ApplicationRunner, Ordered,
|
||||
}
|
||||
|
||||
private JobParameters merge(JobParameters parameters, JobParameters additionals) {
|
||||
Map<String, JobParameter> merged = new LinkedHashMap<>();
|
||||
Map<String, JobParameter<?>> merged = new LinkedHashMap<>();
|
||||
merged.putAll(parameters.getParameters());
|
||||
merged.putAll(additionals.getParameters());
|
||||
return new JobParameters(merged);
|
||||
|
@ -1409,7 +1409,7 @@ bom {
|
||||
]
|
||||
}
|
||||
}
|
||||
library("Spring Batch", "5.0.0-M6") {
|
||||
library("Spring Batch", "5.0.0-SNAPSHOT") {
|
||||
group("org.springframework.batch") {
|
||||
imports = [
|
||||
"spring-batch-bom"
|
||||
|
Loading…
Reference in New Issue
Block a user