From 90749267364f6b67dac70c5b91d4c8eece8babb5 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Thu, 17 Nov 2016 09:12:43 -0500 Subject: [PATCH] Updated RC1 to GA for migration comments, tests and docs. --- .../org/springframework/cloud/task/migration/migration-h2.sql | 2 +- .../springframework/cloud/task/migration/migration-hsqldb.sql | 2 +- .../springframework/cloud/task/migration/migration-mysql.sql | 2 +- .../springframework/cloud/task/migration/migration-oracle.sql | 2 +- .../cloud/task/migration/migration-postgresql.sql | 2 +- .../cloud/task/migration/migration-sqlserver.sql | 2 +- spring-cloud-task-docs/src/main/asciidoc/batch.adoc | 2 +- .../springframework/cloud/task/executionid/TaskStartTests.java | 2 +- .../cloud/task/launcher/TaskLauncherSinkTests.java | 2 +- spring-cloud-task-samples/batch-events/README.adoc | 2 +- spring-cloud-task-samples/batch-job/README.adoc | 2 +- spring-cloud-task-samples/partitioned-batch-job/README.adoc | 2 +- .../src/main/java/io/spring/JobConfiguration.java | 2 +- spring-cloud-task-samples/task-events/README.adoc | 2 +- spring-cloud-task-samples/timestamp/README.adoc | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-h2.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-h2.sql index 87003e3c..fb193bd6 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-h2.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-h2.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE VARCHAR(2500); alter table task_execution add EXTERNAL_EXECUTION_ID VARCHAR(255); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-hsqldb.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-hsqldb.sql index 87003e3c..fb193bd6 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-hsqldb.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-hsqldb.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE VARCHAR(2500); alter table task_execution add EXTERNAL_EXECUTION_ID VARCHAR(255); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-mysql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-mysql.sql index 79e456a2..3ca1dc06 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-mysql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-mysql.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE VARCHAR(2500); alter table task_execution add EXTERNAL_EXECUTION_ID VARCHAR(255); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-oracle.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-oracle.sql index 7e9ec311..bd572cc5 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-oracle.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-oracle.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE varchar2(2500); alter table task_execution add EXTERNAL_EXECUTION_ID varchar2(255); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-postgresql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-postgresql.sql index 87003e3c..fb193bd6 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-postgresql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-postgresql.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE VARCHAR(2500); alter table task_execution add EXTERNAL_EXECUTION_ID VARCHAR(255); diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-sqlserver.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-sqlserver.sql index 87003e3c..fb193bd6 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-sqlserver.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration/migration-sqlserver.sql @@ -1,4 +1,4 @@ -/* If migrating from 1.1.0.M1 to 1.1.0.RC1 you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.GA you do not need to add the ERROR_MESSAGE column. */ alter table task_execution add ERROR_MESSAGE VARCHAR(2500); alter table task_execution add EXTERNAL_EXECUTION_ID VARCHAR(255); diff --git a/spring-cloud-task-docs/src/main/asciidoc/batch.adoc b/spring-cloud-task-docs/src/main/asciidoc/batch.adoc index 58726ef1..e73b032e 100644 --- a/spring-cloud-task-docs/src/main/asciidoc/batch.adoc +++ b/spring-cloud-task-docs/src/main/asciidoc/batch.adoc @@ -78,7 +78,7 @@ public PartitionHandler partitionHandler(TaskLauncher taskLauncher, MavenResource.parse(String.format("%s:%s:%s", "io.spring.cloud", "partitioned-batch-job", - "1.1.0.RC1"), mavenProperties); + "1.1.0.GA"), mavenProperties); DeployerPartitionHandler partitionHandler = new DeployerPartitionHandler(taskLauncher, jobExplorer, resource, "workerStep"); 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 ee677e3e..4efd3619 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 @@ -65,7 +65,7 @@ public class TaskStartTests { private final static int WAIT_INTERVAL = 500; private final static int MAX_WAIT_TIME = 5000; private final static String URL = "maven://io.spring.cloud:" - + "timestamp-task:jar:1.1.0.RC1"; + + "timestamp-task:jar:1.1.0.GA"; private final static String DATASOURCE_URL; private final static String DATASOURCE_USER_NAME = "SA"; private final static String DATASOURCE_USER_PASSWORD = ""; 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 be2fba87..43998805 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 @@ -64,7 +64,7 @@ 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.RC1"; + + "timestamp-task:jar:1.1.0.GA"; private final static String DATASOURCE_URL; private final static String DATASOURCE_USER_NAME = "SA"; private final static String DATASOURCE_USER_PASSWORD = ""; diff --git a/spring-cloud-task-samples/batch-events/README.adoc b/spring-cloud-task-samples/batch-events/README.adoc index 418db1de..672fc8a5 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.1.0.RC1.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json +$ java -jar target/batch-events-1.1.0.GA.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 e1566a6e..97fd5057 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.1.0.RC1.jar +$ java -jar target/batch-job-1.1.0.GA.jar ---- diff --git a/spring-cloud-task-samples/partitioned-batch-job/README.adoc b/spring-cloud-task-samples/partitioned-batch-job/README.adoc index 191c4b0a..c54d155b 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.1.0.RC1.jar +$ java -jar target/partitioned-batch-job-1.1.0.GA.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/src/main/java/io/spring/JobConfiguration.java b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java index bf39b6fb..c0e430b1 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java +++ b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java @@ -93,7 +93,7 @@ public class JobConfiguration { @Bean public PartitionHandler partitionHandler(TaskLauncher taskLauncher, JobExplorer jobExplorer) throws Exception { - Resource resource = resourceLoader.getResource("maven://io.spring.cloud:partitioned-batch-job:1.1.0.RC1"); + Resource resource = resourceLoader.getResource("maven://io.spring.cloud:partitioned-batch-job:1.1.0.GA"); DeployerPartitionHandler partitionHandler = new DeployerPartitionHandler(taskLauncher, jobExplorer, resource, "workerStep"); diff --git a/spring-cloud-task-samples/task-events/README.adoc b/spring-cloud-task-samples/task-events/README.adoc index 2ca96511..d1fb0023 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.1.0.RC1.jar --spring.cloud.stream.bindings.task-events.contentType=application/json +$ java -jar target/task-events-1.1.0.GA.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/timestamp/README.adoc b/spring-cloud-task-samples/timestamp/README.adoc index 8b11bd43..36d30751 100644 --- a/spring-cloud-task-samples/timestamp/README.adoc +++ b/spring-cloud-task-samples/timestamp/README.adoc @@ -22,5 +22,5 @@ $ mvn clean package [source,shell,indent=2] ---- -$ java -jar target/timestamp-task-1.1.0.RC1.jar +$ java -jar target/timestamp-task-1.1.0.GA.jar ----