From 68e5b43b126103440bbc7dc33fb4e2df3e86e277 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 13 Nov 2018 09:08:38 -0500 Subject: [PATCH] Updated versions for 1.3.x --- pom.xml | 16 ++++++++-------- spring-cloud-task-samples/batch-events/pom.xml | 10 +++++----- spring-cloud-task-samples/batch-job/pom.xml | 4 ++-- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- .../partitioned-batch-job/pom.xml | 8 ++++---- spring-cloud-task-samples/task-events/pom.xml | 4 ++-- spring-cloud-task-samples/taskprocessor/pom.xml | 6 +++--- spring-cloud-task-samples/tasksink/pom.xml | 6 +++--- spring-cloud-task-samples/timestamp/pom.xml | 2 +- .../task/launcher/TaskLauncherSinkTests.java | 10 ++++++++-- 10 files changed, 37 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 9010f3c9..f67e44e0 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 1.3.10.RELEASE + 1.3.11.RELEASE @@ -137,13 +137,13 @@ - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 1.2.1.RELEASE - 3.0.8.RELEASE + 1.3.3.RELEASE + 1.3.4.RELEASE + 1.3.9.RELEASE + 1.3.4.RELEASE + 1.3.4.RELEASE + 1.3.4.RELEASE + 3.0.9.RELEASE 1.1 7.0 3.11.0 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 492b90d6..7f1c0768 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE UTF-8 1.7 - 3.0.8.RELEASE + 3.0.9.RELEASE @@ -52,19 +52,19 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.2.1.RELEASE + 1.3.4.RELEASE compile org.springframework.cloud spring-cloud-stream-binder-rabbit-test-support - 1.2.1.RELEASE + 1.3.3.RELEASE test org.springframework.cloud spring-cloud-stream-test-support-internal - 1.2.1.RELEASE + 1.3.3.RELEASE test diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index 0bec1051..83e4a860 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE UTF-8 1.7 - 3.0.8.RELEASE + 3.0.9.RELEASE diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 27df5254..370f9c2f 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 32df95e6..9707772a 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,14 +12,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE UTF-8 1.7 - 3.0.8.RELEASE + 3.0.9.RELEASE @@ -48,13 +48,13 @@ org.springframework.batch spring-batch-integration - 3.0.8.RELEASE + 3.0.9.RELEASE org.springframework.cloud spring-cloud-deployer-local - 1.2.1.RELEASE + 1.3.9.RELEASE diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index e19c5f13..7a688b6c 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE @@ -48,7 +48,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.2.1.RELEASE + 1.3.4.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 396e2ec9..82b2cd37 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.2.1.RELEASE + 1.3.4.RELEASE compile @@ -56,7 +56,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 1.2.1.RELEASE + 1.3.3.RELEASE test diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index f2db0e82..d2063e51 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE @@ -46,13 +46,13 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.2.1.RELEASE + 1.3.4.RELEASE compile org.springframework.cloud spring-cloud-stream-test-support - 1.2.2.RELEASE + 1.3.3.RELEASE test diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index aee33052..c1ca9934 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 1.5.17.RELEASE diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 041f2fe9..e96cf38a 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -108,10 +108,16 @@ public class TaskLauncherSinkTests { assertTrue(testTaskLauncher.getApplicationName().startsWith(TASK_NAME_PREFIX)); } - @Test(expected = MessageHandlingException.class) + @Test public void testInvalidJar() { TaskConfiguration.TestTaskLauncher testTaskLauncher = launchTask( - INVALID_URL, null, null); + INVALID_URL, null, APP_NAME); + verifySuccessWithAppName(testTaskLauncher); + } + private void verifySuccessWithAppName(TaskConfiguration.TestTaskLauncher testTaskLauncher) { + assertEquals(LaunchState.complete, testTaskLauncher.status(DEFAULT_STATUS).getState()); + assertEquals(0, testTaskLauncher.getCommandlineArguments().size()); + assertEquals(APP_NAME, testTaskLauncher.getApplicationName()); } @Test