From c753b98a767419d75ac1faf0f1e50fe538f9596e Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 25 Jan 2022 14:17:57 -0500 Subject: [PATCH] Update task to use Milestone build Updated partitioned sample readme Updated samples base boot version Updated jpa sample to use jakarta --- spring-cloud-task-samples/batch-events/pom.xml | 2 +- spring-cloud-task-samples/batch-job/pom.xml | 2 +- spring-cloud-task-samples/jpa-sample/pom.xml | 2 +- .../java/io/spring/configuration/TaskRunOutput.java | 10 +++++----- .../src/test/java/io/spring/JpaApplicationTests.java | 4 ++-- spring-cloud-task-samples/multiple-datasources/pom.xml | 2 +- .../partitioned-batch-job/README.adoc | 4 ++-- .../partitioned-batch-job/pom.xml | 2 +- .../single-step-batch-job/pom.xml | 2 +- spring-cloud-task-samples/task-events/pom.xml | 2 +- spring-cloud-task-samples/taskprocessor/pom.xml | 2 +- spring-cloud-task-samples/tasksink/pom.xml | 2 +- spring-cloud-task-samples/timestamp/pom.xml | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index f1127e6e..5b485331 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 - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index e5191665..12029e20 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 - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 3aaf5dcb..2d24d43b 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/jpa-sample/src/main/java/io/spring/configuration/TaskRunOutput.java b/spring-cloud-task-samples/jpa-sample/src/main/java/io/spring/configuration/TaskRunOutput.java index 48fe4c89..143e93dc 100644 --- a/spring-cloud-task-samples/jpa-sample/src/main/java/io/spring/configuration/TaskRunOutput.java +++ b/spring-cloud-task-samples/jpa-sample/src/main/java/io/spring/configuration/TaskRunOutput.java @@ -16,11 +16,11 @@ package io.spring.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Entity for the id and output to be written to the data store. 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 e382a86c..0ef95846 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 @@ -24,7 +24,7 @@ import javax.sql.DataSource; import org.h2.tools.Server; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -// import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -93,7 +93,7 @@ public class JpaApplicationTests { this.server.stop(); } - // @Test + @Test public void testBatchJobApp(CapturedOutput capturedOutput) { final String INSERT_MESSAGE = "Hibernate: insert into task_run_output ("; this.context = SpringApplication diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 7253e24a..9c072013 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/partitioned-batch-job/README.adoc b/spring-cloud-task-samples/partitioned-batch-job/README.adoc index 306afbc1..525bc162 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/README.adoc +++ b/spring-cloud-task-samples/partitioned-batch-job/README.adoc @@ -18,8 +18,8 @@ $ ./mvnw clean install [source,shell,indent=2] ---- -$ export SPRING_APPLICATION_JSON='{"spring":{"datasource":{"url":"jdbc:mysql://localhost:3306/","username":"","password":"","driverClassName":"org.mariadb.jdbc.Driver"}}}' -$ java -jar target/partitioned-batch-job-3.0.0.jar +export SPRING_APPLICATION_JSON='{"spring.datasource.url":"jdbc:mariadb://localhost:3306/","spring.datasource.password":"","spring.datasource.username":"","spring.datasource.driverClassName":"org.mariadb.jdbc.Driver"}' +java -jar target/partitioned-batch-job-3.0.0.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 068fbdc8..c65a994d 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 - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/single-step-batch-job/pom.xml b/spring-cloud-task-samples/single-step-batch-job/pom.xml index edb4c57a..02811657 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 6291686a..64d7f6c9 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 - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 0dfffc14..4f67dcf9 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 56be2a24..42ca9a04 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.0-M1 diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index f274b170..be1b1066 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 - 3.0.0-SNAPSHOT + 3.0.0-M1