From 68307a9312ae5bc41e9cbc3a8bb3cd42e057f52b Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 27 Jun 2017 10:25:23 -0400 Subject: [PATCH] Updated deployer dependencies to 1.2.1.RELEASE Also updated the docs --- pom.xml | 8 ++++---- .../batch/configuration/TaskBatchAutoConfiguration.java | 5 ----- .../src/main/asciidoc/getting-started.adoc | 2 +- spring-cloud-task-samples/batch-events/README.adoc | 2 +- spring-cloud-task-samples/batch-job/README.adoc | 2 +- spring-cloud-task-samples/jpa-sample/README.adoc | 2 +- .../partitioned-batch-job/README.adoc | 2 +- spring-cloud-task-samples/partitioned-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/README.adoc | 2 +- 9 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 85c52330..f5726d63 100755 --- a/pom.xml +++ b/pom.xml @@ -138,11 +138,11 @@ 1.2.1.RELEASE - 1.2.1.BUILD-SNAPSHOT - 1.2.1.BUILD-SNAPSHOT + 1.2.1.RELEASE + 1.2.1.RELEASE 1.2.0.RELEASE - 1.2.1.BUILD-SNAPSHOT - 1.2.1.BUILD-SNAPSHOT + 1.2.1.RELEASE + 1.2.1.RELEASE 3.0.7.RELEASE 1.1 7.0 diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java index 3ea8fad9..49578471 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java @@ -15,10 +15,6 @@ */ package org.springframework.cloud.task.batch.configuration; -import java.util.Collection; - -import javax.sql.DataSource; - import org.springframework.batch.core.Job; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -32,7 +28,6 @@ import org.springframework.cloud.task.repository.TaskExplorer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.util.CollectionUtils; /** * Provides auto configuration for the {@link TaskBatchExecutionListener}. 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 0963d273..145d16ff 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.0.RELEASE + 1.2.1.RELEASE [[getting-started-writing-the-code]] diff --git a/spring-cloud-task-samples/batch-events/README.adoc b/spring-cloud-task-samples/batch-events/README.adoc index b8733a62..0bfebdd1 100644 --- a/spring-cloud-task-samples/batch-events/README.adoc +++ b/spring-cloud-task-samples/batch-events/README.adoc @@ -27,7 +27,7 @@ $ ./mvnw clean install [source,shell,indent=2] ---- -$ java -jar target/batch-events-1.2.0.RELEASE.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json +$ java -jar target/batch-events-1.2.1.RELEASE.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json ---- For example you can listen for specific job execution events on a specified channel with a Spring Cloud Stream Sink diff --git a/spring-cloud-task-samples/batch-job/README.adoc b/spring-cloud-task-samples/batch-job/README.adoc index effcae85..305b0d2f 100644 --- a/spring-cloud-task-samples/batch-job/README.adoc +++ b/spring-cloud-task-samples/batch-job/README.adoc @@ -22,5 +22,5 @@ $ mvn clean package [source,shell,indent=2] ---- -$ java -jar target/batch-job-1.2.0.RELEASE.jar +$ java -jar target/batch-job-1.2.1.RELEASE.jar ---- diff --git a/spring-cloud-task-samples/jpa-sample/README.adoc b/spring-cloud-task-samples/jpa-sample/README.adoc index 9e607168..8d39af68 100644 --- a/spring-cloud-task-samples/jpa-sample/README.adoc +++ b/spring-cloud-task-samples/jpa-sample/README.adoc @@ -24,5 +24,5 @@ $ mvn clean package [source,shell,indent=2] ---- -$ java -jar target/jpa-sample-1.2.1.BUILD-SNAPSHOT.jar +$ java -jar target/jpa-sample-1.2.1.RELEASE.jar ---- diff --git a/spring-cloud-task-samples/partitioned-batch-job/README.adoc b/spring-cloud-task-samples/partitioned-batch-job/README.adoc index 4d5ac6c5..ad042c44 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/README.adoc +++ b/spring-cloud-task-samples/partitioned-batch-job/README.adoc @@ -22,7 +22,7 @@ $ export spring_datasource_url=jdbc:mysql://localhost:3306/ $ export spring_datasource_username= $ export spring_datasource_password= $ export spring_datasource_driverClassName=org.mariadb.jdbc.Driver -$ java -jar target/partitioned-batch-job-1.2.0.RELEASE.jar +$ java -jar target/partitioned-batch-job-1.2.1.RELEASE.jar ---- NOTE: This example will use require a MySql RDBMS repository and currently uses the mariadb jdbc driver to connect. diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index eea8cc00..f7298b15 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -53,7 +53,7 @@ org.springframework.cloud spring-cloud-deployer-local - 1.2.0.RELEASE + 1.2.1.RELEASE diff --git a/spring-cloud-task-samples/task-events/README.adoc b/spring-cloud-task-samples/task-events/README.adoc index 5d70fae8..8ff78d06 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.0.RELEASE.jar --spring.cloud.stream.bindings.task-events.contentType=application/json +$ java -jar target/task-events-1.2.1.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