diff --git a/pom.xml b/pom.xml
index ae0627ce..0c0ded25 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-build
- 1.3.5.RELEASE
+ 1.3.12.RELEASE
@@ -137,12 +137,12 @@
- 1.2.1.RELEASE
- 1.2.1.RELEASE
- 1.2.1.RELEASE
+ 1.2.2.RELEASE
+ 1.2.2.RELEASE
+ 1.2.2.RELEASE
1.2.1.RELEASE
- 1.2.1.RELEASE
- 1.2.1.RELEASE
+ 1.2.2.RELEASE
+ 1.2.2.RELEASE
3.0.8.RELEASE
1.1
7.0
diff --git a/spring-cloud-task-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-task-docs/src/main/asciidoc/getting-started.adoc
index 652b74f9..ae8921ba 100755
--- a/spring-cloud-task-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-task-docs/src/main/asciidoc/getting-started.adoc
@@ -145,7 +145,7 @@ Spring Cloud Task itself:
org.springframework.cloud
spring-cloud-task-core
- 1.2.2.RELEASE
+ 1.2.4.RELEASE
[[getting-started-writing-the-code]]
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 063d5516..616a7143 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
@@ -216,7 +216,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 68836fc1..6037b296 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
@@ -63,8 +63,8 @@ public class TaskLauncherSinkTests {
private final static int WAIT_INTERVAL = 500;
private final static int MAX_WAIT_TIME = 10000;
- private final static String URL = "maven://io.spring.cloud:"
- + "timestamp-task:jar:1.1.0.RELEASE";
+ private final static String URL = "maven://org.springframework.cloud.task.app:"
+ + "timestamp-task:2.0.0.RELEASE";
private final static String DATASOURCE_URL;
private final static String DATASOURCE_USER_NAME = "SA";
private final static String DATASOURCE_USER_PASSWORD = "";
@@ -102,7 +102,6 @@ public class TaskLauncherSinkTests {
properties = new HashMap<>();
properties.put("spring.datasource.url", DATASOURCE_URL);
properties.put("spring.datasource.username", DATASOURCE_USER_NAME);
- properties.put("spring.datasource.password", DATASOURCE_USER_PASSWORD);
properties.put("spring.datasource.driverClassName", DATASOURCE_DRIVER_CLASS_NAME);
properties.put("spring.application.name",TASK_NAME);
properties.put("spring.cloud.task.initialize.enable", "false");
@@ -189,7 +188,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 d7d873d8..b84ca453 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
- 1.5.4.RELEASE
+ 1.5.20.RELEASE
@@ -64,7 +64,7 @@
org.springframework.cloud
spring-cloud-stream-test-support-internal
- 1.2.1.RELEASE
+ 1.2.2.RELEASE
test
diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml
index 334fb614..7f69e52c 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
- 1.5.4.RELEASE
+ 1.5.20.RELEASE
diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml
index ab603221..f8096d38 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.20.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 6552daf0..37e627f9 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
@@ -74,7 +74,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/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
index d68e1313..100fc385 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
- 1.5.4.RELEASE
+ 1.5.20.RELEASE
@@ -54,7 +54,7 @@
org.springframework.cloud
spring-cloud-deployer-local
- 1.2.1.RELEASE
+ 1.2.2.RELEASE
diff --git a/spring-cloud-task-samples/task-events/README.adoc b/spring-cloud-task-samples/task-events/README.adoc
index 8d1f27b8..c9d88392 100644
--- a/spring-cloud-task-samples/task-events/README.adoc
+++ b/spring-cloud-task-samples/task-events/README.adoc
@@ -17,7 +17,7 @@ $ ./mvnw clean install
[source,shell,indent=2]
----
-$ java -jar target/task-events-1.2.2.RELEASE.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
+$ java -jar target/task-events-1.2.4.RELEASE.jar --spring.cloud.stream.bindings.task-events.contentType=application/json
----
You can listen for the events on the task-events channel with a Spring Cloud Stream Sink
diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml
index 5f689ea1..a0fffa9e 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.20.RELEASE
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index fd95e0cd..31e6a448 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.20.RELEASE
@@ -56,7 +56,7 @@
org.springframework.cloud
spring-cloud-stream-test-support
- 1.2.1.RELEASE
+ 1.2.2.RELEASE
test
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 03f0a1ef..754dcd7e 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.20.RELEASE
diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml
index 26d2934e..602d8c08 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.20.RELEASE