diff --git a/pom.xml b/pom.xml index 7d881f51..ba6261ca 100755 --- a/pom.xml +++ b/pom.xml @@ -120,8 +120,6 @@ 17 0.0.34 - 1.17.6 - 1.0.8 diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 87a05e5d..ae49c0e9 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -11,9 +11,6 @@ 4.1.0-SNAPSHOT - 1.17.6 - 1.17.6 - 1.0.8 @@ -67,19 +64,11 @@ org.testcontainers testcontainers - ${test.containers.version} test org.testcontainers rabbitmq - ${test.rabbit.containers.version} - test - - - org.rnorth.duct-tape - duct-tape - ${test.ducttape.version} test diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml index ece59493..47d96289 100755 --- a/spring-cloud-task-core/pom.xml +++ b/spring-cloud-task-core/pom.xml @@ -167,25 +167,16 @@ org.testcontainers testcontainers - ${test.containers.version} test org.testcontainers junit-jupiter - ${test.containers.version} test org.testcontainers mariadb - ${test.containers.version} - test - - - org.rnorth.duct-tape - duct-tape - ${test.ducttape.version} test diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 3663cbe8..57259dbc 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -14,11 +14,7 @@ 4.1.0-SNAPSHOT - 1.17.6 - 1.17.6 - 1.0.8 - @@ -28,13 +24,6 @@ pom import - - org.testcontainers - testcontainers-bom - ${test.containers.version} - pom - import - @@ -107,7 +96,6 @@ org.testcontainers testcontainers - ${test.containers.version} test @@ -118,19 +106,11 @@ org.testcontainers rabbitmq - ${test.rabbit.containers.version} test org.testcontainers db2 - ${test.containers.version} - test - - - org.rnorth.duct-tape - duct-tape - ${test.ducttape.version} test 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 b6355f9c..c37b5fff 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 @@ -73,8 +73,6 @@ public class TaskStartTests { private final static int MAX_WAIT_TIME = 5000; - private final static String URL = "maven://io.spring.cloud:" + "timestamp-task:jar:1.1.0.RELEASE"; - private final static String DATASOURCE_URL; private final static String DATASOURCE_USER_NAME = "SA"; diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 824a51b1..a40cbc1c 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud batch-events - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT jar Batch Events Sample Application @@ -13,16 +13,13 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT UTF-8 17 - 1.17.6 - 1.17.6 - 1.0.8 4.1.0-SNAPSHOT 3.1.0-SNAPSHOT diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index c3b6fa21..ecabf008 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -5,7 +5,7 @@ io.spring.cloud batch-job jar - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT Spring Cloud Task Batch Example Batch Job Sample Application @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml index 7dacd509..86f63eca 100644 --- a/spring-cloud-task-samples/jpa-sample/pom.xml +++ b/spring-cloud-task-samples/jpa-sample/pom.xml @@ -5,7 +5,7 @@ io.spring.cloud jpa-sample jar - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT To show users how to enable a task with a JPA application. Spring Cloud Task JPA Sample Application @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml index 2764f032..1ef7400a 100644 --- a/spring-cloud-task-samples/multiple-datasources/pom.xml +++ b/spring-cloud-task-samples/multiple-datasources/pom.xml @@ -5,7 +5,7 @@ io.spring.cloud multiple-datasources jar - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT To show users how to enable a task with a multiple DataSources. @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index e111088a..3872dbd9 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -6,13 +6,13 @@ partitioned-batch-job jar Partitioned Batch Job - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT Sample of using the DeployerPartitionHandler org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT 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 10f4f7af..d11fe877 100644 --- a/spring-cloud-task-samples/single-step-batch-job/pom.xml +++ b/spring-cloud-task-samples/single-step-batch-job/pom.xml @@ -7,13 +7,13 @@ single-step-batch-job jar Single Step Batch Job Task - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT Spring Cloud Single Step Batch Job Task org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/single-step-batch-job/src/main/resources/application.properties b/spring-cloud-task-samples/single-step-batch-job/src/main/resources/application.properties index a421a19f..d5cf00b9 100644 --- a/spring-cloud-task-samples/single-step-batch-job/src/main/resources/application.properties +++ b/spring-cloud-task-samples/single-step-batch-job/src/main/resources/application.properties @@ -3,3 +3,4 @@ spring.batch.job.jobName=job spring.batch.job.stepName=step1 spring.batch.job.chunkSize=5 spring.batch.jdbc.initialize-schema=always +logging.level.org.springframework.cloud.task=debug diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 1408cfe7..2d9c1929 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud task-events - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT jar Task Events @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/task-observations/pom.xml b/spring-cloud-task-samples/task-observations/pom.xml index 888e92d2..ca002a7e 100644 --- a/spring-cloud-task-samples/task-observations/pom.xml +++ b/spring-cloud-task-samples/task-observations/pom.xml @@ -5,18 +5,17 @@ 4.0.0 io.spring task-observations - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT task observation sample Displays task observations as well as commandline and application runner observations 17 - 2022.0.4-SNAPSHOT org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index e5fe9e61..26e7c932 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud taskprocessor - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT jar Task Processor Sample Application @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT @@ -68,6 +68,10 @@ ${spring-cloud-stream.version} test + + com.h2database + h2 + diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index decb65a2..5f46d6f6 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -4,7 +4,7 @@ io.spring.cloud tasksink - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT jar Task Sink Sample Application @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.7 + 3.2.0-SNAPSHOT @@ -72,6 +72,10 @@ ${spring-cloud-stream.version} test + + com.h2database + h2 + diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 5fd24b6c..24bdac17 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.7 + 3.2.0-SNAPSHOT