From 40b984050608f0e00847bb4647abc18f70e63c78 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@vmware.com>
Date: Fri, 11 Mar 2022 09:57:50 -0500
Subject: [PATCH] Updated Deployer Version to 2.8

Reactivated tests for rempote partition
---
 pom.xml                                       |  4 +-
 .../partitioned-batch-job/pom.xml             |  2 +-
 .../partitioner/TaskPartitionerTests.java     | 42 +++++++++----------
 spring-cloud-task-samples/tasksink/pom.xml    |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index add9abf1..cbfbcdfd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
 	<properties>
 
 		<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-deployer.version>2.7.0</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>2.7.0
+		<spring-cloud-deployer.version>2.8.0-SNAPSHOT</spring-cloud-deployer.version>
+		<spring-cloud-deployer-local.version>2.8.0-SNAPSHOT
 		</spring-cloud-deployer-local.version>
 		<spring-cloud-stream-binder-rabbit.version>${spring-cloud-stream.version}
 		</spring-cloud-stream-binder-rabbit.version>
diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
index dcdfd617..33387e26 100644
--- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml
+++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
@@ -20,7 +20,7 @@
 		<test.cloud.support>4.0.0-SNAPSHOT</test.cloud.support>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
-		<spring-cloud-deployer>2.7.0</spring-cloud-deployer>
+		<spring-cloud-deployer>2.8.0-SNAPSHOT</spring-cloud-deployer>
 	</properties>
 
 	<dependencyManagement>
diff --git a/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java b/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java
index 14fb12ad..1450dd58 100644
--- a/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java
+++ b/spring-cloud-task-samples/partitioned-batch-job/src/test/java/org/springframework/cloud/task/partitioner/TaskPartitionerTests.java
@@ -90,27 +90,27 @@ public class TaskPartitionerTests {
 
 	@Test
 	public void testWithLocalDeployer() throws Exception {
-//		SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class);
-//		app.setAdditionalProfiles("master");
-//		Properties properties = new Properties();
-//		properties.setProperty("spring.datasource.url", DATASOURCE_URL);
-//		properties.setProperty("spring.datasource.username", DATASOURCE_USER_NAME);
-//		properties.setProperty("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
-//		properties.setProperty("spring.cloud.deployer.local.use-spring-application-json", "false");
-//		app.setDefaultProperties(properties);
-//		app.run();
-//
-//		Page<TaskExecution> taskExecutions = this.taskExplorer
-//			.findAll(PageRequest.of(0, 10));
-//		assertThat(taskExecutions.getTotalElements()).as("Five rows are expected")
-//			.isEqualTo(5);
-//		assertThat(this.taskExplorer
-//			.getTaskExecutionCountByTaskName("PartitionedBatchJobTask"))
-//			.as("Only One master is expected").isEqualTo(1);
-//		for (TaskExecution taskExecution : taskExecutions) {
-//			assertThat(taskExecution.getExitCode()
-//				.intValue()).as("return code should be 0").isEqualTo(0);
-//		}
+		SpringApplication app = new SpringApplication(PartitionedBatchJobApplication.class);
+		app.setAdditionalProfiles("master");
+		Properties properties = new Properties();
+		properties.setProperty("spring.datasource.url", DATASOURCE_URL);
+		properties.setProperty("spring.datasource.username", DATASOURCE_USER_NAME);
+		properties.setProperty("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
+		properties.setProperty("spring.cloud.deployer.local.use-spring-application-json", "false");
+		app.setDefaultProperties(properties);
+		app.run();
+
+		Page<TaskExecution> taskExecutions = this.taskExplorer
+			.findAll(PageRequest.of(0, 10));
+		assertThat(taskExecutions.getTotalElements()).as("Five rows are expected")
+			.isEqualTo(5);
+		assertThat(this.taskExplorer
+			.getTaskExecutionCountByTaskName("PartitionedBatchJobTask"))
+			.as("Only One master is expected").isEqualTo(1);
+		for (TaskExecution taskExecution : taskExecutions) {
+			assertThat(taskExecution.getExitCode()
+				.intValue()).as("return code should be 0").isEqualTo(0);
+		}
 	}
 
 	@Configuration(proxyBeanMethods = false)
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index cdd5cfd0..7df19250 100644
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -24,7 +24,7 @@
 		<skipInstall>true</skipInstall>
 		<spring-cloud-stream>4.0.0-M1</spring-cloud-stream>
 		<spring-cloud-task>4.0.0-SNAPSHOT</spring-cloud-task>
-		<spring-cloud-deployer-version>2.7.0</spring-cloud-deployer-version>
+		<spring-cloud-deployer-version>2.8.0-SNAPSHOT</spring-cloud-deployer-version>
 	</properties>
 
 	<dependencyManagement>