Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Spring Batch 5.0.0-SNAPSHOT

Browse Source 
See gh-32618
This commit is contained in:
Brian Clozel 2022-10-06 15:17:41 +02:00
parent 6ff31fe231
commit c8c73b195d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java
View File

@ -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);

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

@ -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"