SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated samples to boot 3.2

Browse Source 
Removed versions for test containers.  This is now managed by Boot
Updated samples to be version 3.1.
This commit is contained in:
Glenn Renfro
2023-06-15 09:41:17 -04:00
parent c78d09f343
commit cd54b77c6f
17 changed files with 30 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -120,8 +120,6 @@
</maven-checkstyle-plugin.includeTestSourceDirectory>
<java.version>17</java.version>
<spring-javaformat-maven-plugin.version>0.0.34</spring-javaformat-maven-plugin.version>
<test.containers.version>1.17.6</test.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>
<build>

11
spring-cloud-starter-single-step-batch-job/pom.xml
View File

@@ -11,9 +11,6 @@
<properties>
<spring-cloud-commons.version>4.1.0-SNAPSHOT</spring-cloud-commons.version>
<test.containers.version>1.17.6</test.containers.version>
<test.rabbit.containers.version>1.17.6</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>
<dependencies>
@@ -67,19 +64,11 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>rabbitmq</artifactId>
<version>${test.rabbit.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.rnorth.duct-tape</groupId>
<artifactId>duct-tape</artifactId>
<version>${test.ducttape.version}</version>
<scope>test</scope>
</dependency>
<dependency>

9
spring-cloud-task-core/pom.xml
View File

@@ -167,25 +167,16 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.rnorth.duct-tape</groupId>
<artifactId>duct-tape</artifactId>
<version>${test.ducttape.version}</version>
<scope>test</scope>
</dependency>
<dependency>

20
spring-cloud-task-integration-tests/pom.xml
View File

@@ -14,11 +14,7 @@
<properties>
<spring-cloud-commons.version>4.1.0-SNAPSHOT</spring-cloud-commons.version>
<test.containers.version>1.17.6</test.containers.version>
<test.rabbit.containers.version>1.17.6</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
@@ -28,13 +24,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${test.containers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -107,7 +96,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -118,19 +106,11 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>rabbitmq</artifactId>
<version>${test.rabbit.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>db2</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.rnorth.duct-tape</groupId>
<artifactId>duct-tape</artifactId>
<version>${test.ducttape.version}</version>
<scope>test</scope>
</dependency>
<dependency>

2
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java
View File

@@ -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";

7
spring-cloud-task-samples/batch-events/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>batch-events</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Batch Events Sample Application</name>
@@ -13,16 +13,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<test.containers.version>1.17.6</test.containers.version>
<test.rabbit.containers.version>1.17.6</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
<spring-cloud-stream.version>4.1.0-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-task.version>3.1.0-SNAPSHOT</spring-cloud-task.version>
</properties>

4
spring-cloud-task-samples/batch-job/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>batch-job</artifactId>
<packaging>jar</packaging>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<description>Spring Cloud Task Batch Example</description>
<name>Batch Job Sample Application</name>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/jpa-sample/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>jpa-sample</artifactId>
<packaging>jar</packaging>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<description>To show users how to enable a task with a JPA application.</description>
<name>Spring Cloud Task JPA Sample Application</name>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/multiple-datasources/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>multiple-datasources</artifactId>
<packaging>jar</packaging>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<description>To show users how to enable a task with a multiple DataSources.
</description>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/partitioned-batch-job/pom.xml
View File

@@ -6,13 +6,13 @@
<artifactId>partitioned-batch-job</artifactId>
<packaging>jar</packaging>
<name>Partitioned Batch Job</name>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<description>Sample of using the DeployerPartitionHandler</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

4
spring-cloud-task-samples/single-step-batch-job/pom.xml
View File

@@ -7,13 +7,13 @@
<artifactId>single-step-batch-job</artifactId>
<packaging>jar</packaging>
<name>Single Step Batch Job Task</name>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<description>Spring Cloud Single Step Batch Job Task</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

1
spring-cloud-task-samples/single-step-batch-job/src/main/resources/application.properties
View File

@@ -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

4
spring-cloud-task-samples/task-events/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>task-events</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Task Events</name>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

5
spring-cloud-task-samples/task-observations/pom.xml
View File

@@ -5,18 +5,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.spring</groupId>
<artifactId>task-observations</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>task observation sample</name>
<description>Displays task observations as well as commandline and application runner observations</description>
<properties>
<java.version>17</java.version>
<spring-cloud.version>2022.0.4-SNAPSHOT</spring-cloud.version>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>

8
spring-cloud-task-samples/taskprocessor/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>taskprocessor</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Task Processor Sample Application</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -68,6 +68,10 @@
<version>${spring-cloud-stream.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
</dependencies>
<repositories>

8
spring-cloud-task-samples/tasksink/pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>io.spring.cloud</groupId>
<artifactId>tasksink</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Task Sink Sample Application</name>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -72,6 +72,10 @@
<version>${spring-cloud-stream.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
</dependencies>
<build>

2
spring-cloud-task-samples/timestamp/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.7</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath />
</parent>