Upgraded master to use Boot 2.3.0.M4

Author: cppwfs

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -109,11 +109,11 @@
 	</modules>
 
 	<properties>
-		<spring-cloud-stream.version>3.0.2.BUILD-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-deployer.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>2.1.1.BUILD-SNAPSHOT
+		<spring-cloud-stream.version>3.1.0.BUILD-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-deployer.version>2.3.0.BUILD-SNAPSHOT</spring-cloud-deployer.version>
+		<spring-cloud-deployer-local.version>2.3.0.BUILD-SNAPSHOT
 		</spring-cloud-deployer-local.version>
-		<spring-cloud-stream-binder-rabbit.version>3.0.2.BUILD-SNAPSHOT
+		<spring-cloud-stream-binder-rabbit.version>3.1.0.BUILD-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>

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java

@@ -19,6 +19,7 @@
 import org.junit.Test;
 
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
+import org.springframework.boot.autoconfigure.batch.JobLauncherApplicationRunner;
 import org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -98,7 +99,7 @@ private void validateJobNames(AssertableApplicationContext context, String jobNa
 	@Test
 	public void testAutoBuiltDataSourceWithTaskJobLauncherCLRDisabled() {
 		this.contextRunner.run(context -> {
-			assertThat(context).hasSingleBean(JobLauncherCommandLineRunner.class);
+			assertThat(context).hasSingleBean(JobLauncherApplicationRunner.class);
 			assertThat(context).doesNotHaveBean(TaskJobLauncherCommandLineRunner.class);
 		});
 	}

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerTests.java

@@ -43,7 +43,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
-import org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner;
+import org.springframework.boot.autoconfigure.batch.JobLauncherApplicationRunner;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration;
@@ -152,7 +152,7 @@ public void testCommandLineRunnerSetToFalse() {
 						TaskJobLauncherCommandLineRunnerTests.JobConfiguration.class },
 				enabledArgs);
 		validateContext();
-		assertThat(this.applicationContext.getBean(JobLauncherCommandLineRunner.class))
+		assertThat(this.applicationContext.getBean(JobLauncherApplicationRunner.class))
 				.isNotNull();
 
 		Executable executable = () -> this.applicationContext

spring-cloud-task-dependencies/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>
 
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-			<version>3.0.2.BUILD-SNAPSHOT</version>
+			<version>3.1.0.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>
 

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>
 

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>
 

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>
 
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-local</artifactId>
-			<version>2.1.1.BUILD-SNAPSHOT</version>
+			<version>2.3.0.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

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.2.2.BUILD-SNAPSHOT</version>
+		<version>2.3.0.M4</version>
 		<relativePath />
 	</parent>