From 2e8ae1f43c1780294136c30dbbc1f7b7c16feb47 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Thu, 6 Jun 2019 09:59:53 -0400 Subject: [PATCH] Updated dependencies and tests README update --- README.adoc | 2 +- pom.xml | 10 +++++----- .../cloud/task/SimpleTaskAutoConfigurationTests.java | 4 ++-- spring-cloud-task-dependencies/pom.xml | 2 +- .../cloud/task/executionid/TaskStartTests.java | 2 +- .../cloud/task/launcher/TaskLauncherSinkTests.java | 2 +- spring-cloud-task-samples/batch-events/pom.xml | 8 ++++---- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- .../src/test/java/io/spring/JpaApplicationTests.java | 2 +- spring-cloud-task-samples/multiple-datasources/pom.xml | 2 +- .../partitioned-batch-job/pom.xml | 4 ++-- 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 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.adoc b/README.adoc index 04efd173..bbe9b868 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -= Spring Cloud Task image:https://build.spring.io/plugins/servlet/wittified/build-status/SCT-STASK[Build Status, link=https://build.spring.io/browse/SCT-STASK] image:https://badge.waffle.io/spring-cloud/spring-cloud-task.svg?label=ready&title=Ready[Stories in Ready, link=https://waffle.io/spring-cloud/spring-cloud-task] image:https://badge.waffle.io/spring-cloud/spring-cloud-task.svg?label=In%20Progress&title=In%20Progress[Stories in Progress, link=https://waffle.io/spring-cloud/spring-cloud-task] += Spring Cloud Task image:https://build.spring.io/plugins/servlet/wittified/build-status/SCT-STASK[Build Status, link=https://build.spring.io/browse/SCT-STASK] image:https://badges.gitter.im/spring-cloud/spring-cloud-task.svg[link="https://gitter.im/spring-cloud/spring-cloud-task?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] diff --git a/pom.xml b/pom.xml index 8f938533..bda424a7 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -109,10 +109,10 @@ - 2.1.2.RELEASE - 2.0.0.RELEASE - 2.0.0.RELEASE - 2.1.2.RELEASE + 2.1.3.RELEASE + 2.0.1.RELEASE + 2.0.2.RELEASE + 2.1.3.RELEASE 1.1 8.0 5.3.1 diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java index ff09c732..ee91a8dd 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/SimpleTaskAutoConfigurationTests.java @@ -129,10 +129,10 @@ public class SimpleTaskAutoConfigurationTests { verifyExceptionThrownDefaultExecutable(ApplicationContextException.class, "Failed to start " + "bean 'taskLifecycleListener'; nested exception is " + "org.springframework.dao.DataAccessResourceFailureException: " + - "Could not obtain sequence value; nested exception is org.h2.jdbc.JdbcSQLException: " + + "Could not obtain sequence value; nested exception is org.h2.jdbc.JdbcSQLSyntaxErrorException: " + "Syntax error in SQL statement \"SELECT FOOBARLESSSEQ.NEXTVAL FROM[*] DUAL \"; " + "expected \"identifier\"; SQL statement:\n" + - "select foobarlessSEQ.nextval from dual [42001-197]", applicationContextRunner); + "select foobarlessSEQ.nextval from dual [42001-199]", applicationContextRunner); } @Test diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 42e2ca56..acc5e35c 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.3.RELEASE + 2.1.5.RELEASE diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java index 7459e464..ec9da302 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java @@ -278,7 +278,7 @@ public class TaskStartTests { Server server = null; try { if(defaultServer == null) { - server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", + server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)).start(); defaultServer = server; } diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 924abb26..96d9866f 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -192,7 +192,7 @@ public class TaskLauncherSinkTests { public Server initH2TCPServer() { Server server; try { - server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", + server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)).start(); } catch (SQLException e) { diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index acbcdd40..27313d5c 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -47,19 +47,19 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.1.2.RELEASE + 2.1.3.RELEASE compile org.springframework.cloud spring-cloud-stream-binder-rabbit-test-support - 2.1.2.RELEASE + 2.1.3.RELEASE test org.springframework.cloud spring-cloud-stream-test-support-internal - 2.1.2.RELEASE + 2.1.3.RELEASE test diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index ee497e22..a13e19d1 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.5.RELEASE diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index ffee8368..84d07b86 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 - 2.1.3.RELEASE + 2.1.5.RELEASE diff --git a/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java b/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java index 5678cb2c..af772514 100644 --- a/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java +++ b/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java @@ -77,7 +77,7 @@ public class JpaApplicationTests { dataSource.setPassword(DATASOURCE_USER_PASSWORD); this.dataSource = dataSource; try { - this.server = Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)) + this.server = Server.createTcpServer("-ifNotExists", "-tcp", "-tcpAllowOthers", "-tcpPort", String.valueOf(randomPort)) .start(); } catch (SQLException e) { diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index a463d635..20cd9e80 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.5.RELEASE diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index 82647998..6b7e93a8 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 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -53,7 +53,7 @@ org.springframework.cloud spring-cloud-deployer-local - 2.0.0.RELEASE + 2.0.2.RELEASE diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 42dbf807..47d4a85f 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 - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -43,7 +43,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.1.2.RELEASE + 2.1.3.RELEASE compile diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index d7052fee..31a9e57a 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 - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -42,7 +42,7 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.1.2.RELEASE + 2.1.3.RELEASE compile @@ -52,7 +52,7 @@ org.springframework.cloud spring-cloud-stream-test-support - 2.1.2.RELEASE + 2.1.3.RELEASE test diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index e78e411e..05db475b 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 - 2.1.3.RELEASE + 2.1.5.RELEASE @@ -42,13 +42,13 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - 2.1.2.RELEASE + 2.1.3.RELEASE compile org.springframework.cloud spring-cloud-stream-test-support - 2.1.2.RELEASE + 2.1.3.RELEASE test diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 95d2fad2..19adb168 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 - 2.1.3.RELEASE + 2.1.5.RELEASE