From d8ef256b0cbf9f360c92ede03936796b9ae536ca Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@vmware.com>
Date: Tue, 14 Dec 2021 11:48:24 -0500
Subject: [PATCH] Updated TaskJobCommandLineRunner to use update batch param
 cleanup

---
 pom.xml                                                       | 4 ++--
 .../task/batch/handler/TaskJobLauncherCommandLineRunner.java  | 4 ++--
 spring-cloud-task-samples/batch-events/pom.xml                | 2 +-
 spring-cloud-task-samples/batch-job/pom.xml                   | 2 +-
 spring-cloud-task-samples/jpa-sample/pom.xml                  | 2 +-
 spring-cloud-task-samples/multiple-datasources/pom.xml        | 2 +-
 spring-cloud-task-samples/partitioned-batch-job/pom.xml       | 2 +-
 spring-cloud-task-samples/single-step-batch-job/pom.xml       | 2 +-
 spring-cloud-task-samples/task-events/pom.xml                 | 2 +-
 spring-cloud-task-samples/taskprocessor/pom.xml               | 2 +-
 spring-cloud-task-samples/tasksink/pom.xml                    | 2 +-
 spring-cloud-task-samples/timestamp/pom.xml                   | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 49a15c46..ca2cb85e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.5-SNAPSHOT</version>
+		<version>3.0.5</version>
 		<relativePath />
 	</parent>
 
@@ -110,7 +110,7 @@
 	</modules>
 
 	<properties>
-		<spring-cloud-stream.version>3.1.4</spring-cloud-stream.version>
+		<spring-cloud-stream.version>3.1.6</spring-cloud-stream.version>
 		<spring-cloud-deployer.version>2.5.2</spring-cloud-deployer.version>
 		<spring-cloud-deployer-local.version>2.5.2
 		</spring-cloud-deployer-local.version>
diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunner.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunner.java
index b8166d6f..fb591bf1 100644
--- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunner.java
+++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunner.java
@@ -214,11 +214,11 @@ public class TaskJobLauncherCommandLineRunner extends JobLauncherCommandLineRunn
 
 		for (Map.Entry<String, JobParameter> parameter : copy.entrySet()) {
 			if (!parameter.getValue().isIdentifying()) {
-				parameterMap.remove(parameter.getKey());
+				copy.put(parameter.getKey(), parameter.getValue());
 			}
 		}
 
-		return new JobParameters(parameterMap);
+		return new JobParameters(copy);
 	}
 
 	private boolean isStoppedOrFailed(JobExecution execution) {
diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml
index 38ea8755..c1359228 100644
--- a/spring-cloud-task-samples/batch-events/pom.xml
+++ b/spring-cloud-task-samples/batch-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml
index 7c3fa549..50064e01 100644
--- a/spring-cloud-task-samples/batch-job/pom.xml
+++ b/spring-cloud-task-samples/batch-job/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml
index c667dbb3..520fc49d 100644
--- a/spring-cloud-task-samples/jpa-sample/pom.xml
+++ b/spring-cloud-task-samples/jpa-sample/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml
index 36c9b9a3..94c5c41d 100644
--- a/spring-cloud-task-samples/multiple-datasources/pom.xml
+++ b/spring-cloud-task-samples/multiple-datasources/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
index a0342a60..8092f3b3 100644
--- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml
+++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml
index 047ad3b9..b2a96cd9 100644
--- a/spring-cloud-task-samples/single-step-batch-job/pom.xml
+++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml
index 14f2b741..5c4f6f2c 100644
--- a/spring-cloud-task-samples/task-events/pom.xml
+++ b/spring-cloud-task-samples/task-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index dcb16088..94720a56 100644
--- a/spring-cloud-task-samples/taskprocessor/pom.xml
+++ b/spring-cloud-task-samples/taskprocessor/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 4cc425dd..2b27b74b 100644
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml
index 91dad82a..21dc1ef6 100644
--- a/spring-cloud-task-samples/timestamp/pom.xml
+++ b/spring-cloud-task-samples/timestamp/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.6</version>
+		<version>2.4.13</version>
 		<relativePath />
 	</parent>