diff --git a/pom.xml b/pom.xml
index f77cbc17..1c2601bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -110,11 +110,11 @@
 	</modules>
 
 	<properties>
-		<spring-cloud-stream.version>3.1.0.BUILD-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-deployer.version>2.3.2.BUILD-SNAPSHOT</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>2.3.2.BUILD-SNAPSHOT
+		<spring-cloud-stream.version>3.1.0-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-deployer.version>2.4.0-M1</spring-cloud-deployer.version>
+		<spring-cloud-deployer-local.version>2.4.0-M1
 		</spring-cloud-deployer-local.version>
-		<spring-cloud-stream-binder-rabbit.version>3.1.0.BUILD-SNAPSHOT
+		<spring-cloud-stream-binder-rabbit.version>3.1.0-SNAPSHOT
 		</spring-cloud-stream-binder-rabbit.version>
 		<commons-logging.version>1.1</commons-logging.version>
 		<java-ee-api.version>8.0</java-ee-api.version>
diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml
index 4807105c..31a67415 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -37,7 +37,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-dependencies</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-			<version>3.1.0.BUILD-SNAPSHOT</version>
+			<version>3.1.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml
index c525a088..f4267a3d 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
index 9e1c3f8a..4f1a5fb9 100644
--- a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
+++ b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
@@ -27,8 +27,7 @@ import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Verifies that the Task Application outputs the correct task log entries.
@@ -50,24 +49,18 @@ public class BatchJobApplicationTests {
 		SpringApplication.run(BatchJobApplication.class);
 
 		String output = capturedOutput.toString();
-		assertTrue("Unable to find the timestamp: " + output,
-			output.contains(JOB_RUN_MESSAGE));
-		assertTrue("Test results do not show create task message: " + output,
-			output.contains(CREATE_TASK_MESSAGE));
-		assertTrue("Test results do not show success message: " + output,
-			output.contains(UPDATE_TASK_MESSAGE));
-		assertTrue("Test results do not show success message: " + output,
-			output.contains(EXIT_CODE_MESSAGE));
+		assertThat(output).contains(JOB_RUN_MESSAGE);
+		assertThat(output).contains(CREATE_TASK_MESSAGE);
+		assertThat(output).contains(UPDATE_TASK_MESSAGE);
+		assertThat(output).contains(EXIT_CODE_MESSAGE);
 
 		int i = output.indexOf(JOB_ASSOCIATION_MESSAGE);
 
-		assertTrue("Test results do not show the listener message: " + output,
-			i > 0);
+		assertThat(i).isGreaterThan(0);
 
 		int j = output.indexOf(JOB_ASSOCIATION_MESSAGE, i + 1);
 
-		assertTrue("Test results do not show the listener message: " + output,
-			j > i);
+		assertThat(j).isGreaterThan(i);
 
 
 		String taskTitle = "Demo Batch Job Task";
@@ -78,7 +71,7 @@ public class BatchJobApplicationTests {
 		while (matcher.find()) {
 			count++;
 		}
-		assertEquals("The number of task titles did not match expected: ", 1, count);
+		assertThat(count).isEqualTo(1);
 	}
 
 }
diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml
index 04fd3223..1457ab68 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml
index 29fc64e5..d8a9de15 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</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 af550167..857b577a 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-local</artifactId>
-			<version>2.3.2.BUILD-SNAPSHOT</version>
+			<version>2.4.0-M1</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml
index 1ebc4d26..429b7861 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -34,7 +34,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-dependencies</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index 95551a73..2733826d 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -35,7 +35,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-dependencies</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 4b26304b..18fb4c16 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -36,7 +36,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-dependencies</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml
index 44d91ea0..67e8d7b2 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.3.1.BUILD-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>