SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolved Batch Job Param reconfiguration for TaskJobApplicationRunner

Browse Source 
Resolved issue with EmbeddedKafka failure in tests

Updated all versions
This commit is contained in:
Glenn Renfro
2021-10-08 11:44:26 -04:00
committed by Glenn Renfro
parent dc1c8e5d66
commit fe0b754f35
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-starter-single-step-batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<test.containers.version>1.15.3</test.containers.version> <test.containers.version>1.15.3</test.containers.version>
<test.rabbit.containers.version>1.15.3</test.rabbit.containers.version> <test.rabbit.containers.version>1.15.3</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version> <test.ducttape.version>1.0.8</test.ducttape.version>
<spring-kafka-version>2.8.0-M1</spring-kafka-version> <spring-kafka-version>2.8.0-RC1</spring-kafka-version>
<spring-cloud-stream.version>3.2.0-SNAPSHOT</spring-cloud-stream.version> <spring-cloud-stream.version>3.2.0-SNAPSHOT</spring-cloud-stream.version>
</properties> </properties>

10
spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunner.java
View File

@@ -208,15 +208,15 @@ public class TaskJobLauncherApplicationRunner extends JobLauncherApplicationRunn
private JobParameters removeNonIdentifying(JobParameters parameters) { private JobParameters removeNonIdentifying(JobParameters parameters) {
Map<String, JobParameter> parameterMap = parameters.getParameters(); Map<String, JobParameter> parameterMap = parameters.getParameters();
HashMap<String, JobParameter> copy = new HashMap<>(parameterMap); HashMap<String, JobParameter> copy = new HashMap<>();
for (Map.Entry<String, JobParameter> parameter : copy.entrySet()) { for (Map.Entry<String, JobParameter> parameter : parameterMap.entrySet()) {
if (!parameter.getValue().isIdentifying()) { 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) { private boolean isStoppedOrFailed(JobExecution execution) {

2
spring-cloud-task-samples/batch-events/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/jpa-sample/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/multiple-datasources/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/single-step-batch-job/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/task-events/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/taskprocessor/pom.xml
View File

@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>

2
spring-cloud-task-samples/timestamp/pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-SNAPSHOT</version> <version>2.6.0-M3</version>
<relativePath /> <relativePath />
</parent> </parent>