From 91485769d56f0fdc8a9fd3dfcad7125cad18f727 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Tue, 22 Nov 2016 10:22:13 -0600 Subject: [PATCH] Fixed release versions --- .../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 fb193bd6..8c3b11f2 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 fb193bd6..8c3b11f2 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 3ca1dc06..bc8cd948 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 bd572cc5..afc4905f 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 fb193bd6..8c3b11f2 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 fb193bd6..8c3b11f2 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.GA you do not need to add +/* If migrating from 1.1.0.M1 to 1.1.0.RELEASE 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 e73b032e..5be59741 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.GA"), mavenProperties); + "1.1.0.RELEASE"), 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 4efd3619..6d21a3c6 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.GA"; + + "timestamp-task:jar:1.1.0.RELEASE"; 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 43998805..7033c594 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.GA"; + + "timestamp-task:jar:1.1.0.RELEASE"; 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 672fc8a5..13a6a6bf 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.GA.jar --spring.cloud.stream.bindings.batch-events.contentType=application/json +$ java -jar target/batch-events-1.1.0.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 97fd5057..6e33cb99 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.GA.jar +$ java -jar target/batch-job-1.1.0.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 c54d155b..2f8b8109 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.GA.jar +$ java -jar target/partitioned-batch-job-1.1.0.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/src/main/java/io/spring/JobConfiguration.java b/spring-cloud-task-samples/partitioned-batch-job/src/main/java/io/spring/JobConfiguration.java index c0e430b1..2ab124de 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.GA"); + Resource resource = resourceLoader.getResource("maven://io.spring.cloud:partitioned-batch-job:1.1.0.RELEASE"); 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 d1fb0023..77d81c58 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.GA.jar --spring.cloud.stream.bindings.task-events.contentType=application/json +$ java -jar target/task-events-1.1.0.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/timestamp/README.adoc b/spring-cloud-task-samples/timestamp/README.adoc index 36d30751..d182402a 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.GA.jar +$ java -jar target/timestamp-task-1.1.0.RELEASE.jar ----