From c8c73b195d53be024b08286fec71279b5aecbd56 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 6 Oct 2022 15:17:41 +0200 Subject: [PATCH] Switch to Spring Batch 5.0.0-SNAPSHOT See gh-32618 --- .../autoconfigure/batch/JobLauncherApplicationRunner.java | 4 ++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java index 30927aafcc9..1f95bd5dcd2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java @@ -229,7 +229,7 @@ public class JobLauncherApplicationRunner implements ApplicationRunner, Ordered, } private JobParameters getGetIdentifying(JobParameters parameters) { - HashMap nonIdentifying = new LinkedHashMap<>(parameters.getParameters().size()); + HashMap> 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 merged = new LinkedHashMap<>(); + Map> merged = new LinkedHashMap<>(); merged.putAll(parameters.getParameters()); merged.putAll(additionals.getParameters()); return new JobParameters(merged); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ce14c7f2069..aefc155e056 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -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"