Updated Base Version to 2.2.x

Removed Task Dependencies.  These should be brought in by Boot
This commit is contained in:
Glenn Renfro
2019-02-21 16:52:00 -05:00
committed by Michael Minella
parent 8a3ac48cc3
commit c4abbbcbbf
18 changed files with 35 additions and 52 deletions

20
pom.xml
View File

@@ -13,7 +13,7 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Cloud Task Build</name> <name>Spring Cloud Task Build</name>
<description>Spring Cloud Task Build</description> <description>Spring Cloud Task Build</description>
@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@@ -76,21 +76,6 @@
<version>${spring-cloud-deployer-local.version}</version> <version>${spring-cloud-deployer-local.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId>
<version>${spring-batch.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-infrastructure</artifactId>
<version>${spring-batch.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-integration</artifactId>
<version>${spring-batch.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-test-support-internal</artifactId> <artifactId>spring-cloud-stream-test-support-internal</artifactId>
@@ -132,7 +117,6 @@
</spring-cloud-deployer-local.version> </spring-cloud-deployer-local.version>
<spring-cloud-stream-binder-rabbit.version>2.1.0.RELEASE <spring-cloud-stream-binder-rabbit.version>2.1.0.RELEASE
</spring-cloud-stream-binder-rabbit.version> </spring-cloud-stream-binder-rabbit.version>
<spring-batch.version>4.1.1.RELEASE</spring-batch.version>
<commons-logging.version>1.1</commons-logging.version> <commons-logging.version>1.1</commons-logging.version>
<java-ee-api.version>8.0</java-ee-api.version> <java-ee-api.version>8.0</java-ee-api.version>
<junit.version>5.3.1</junit.version> <junit.version>5.3.1</junit.version>

View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cloud-starter-task</artifactId> <artifactId>spring-cloud-starter-task</artifactId>

View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cloud-task-batch</artifactId> <artifactId>spring-cloud-task-batch</artifactId>

View File

@@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cloud-task-core</artifactId> <artifactId>spring-cloud-task-core</artifactId>

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Cloud Task Dependencies</name> <name>Spring Cloud Task Dependencies</name>
<description>Spring Cloud Task Dependencies</description> <description>Spring Cloud Task Dependencies</description>
@@ -21,22 +21,22 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-task</artifactId> <artifactId>spring-cloud-starter-task</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-core</artifactId> <artifactId>spring-cloud-task-core</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-batch</artifactId> <artifactId>spring-cloud-task-batch</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-stream</artifactId> <artifactId>spring-cloud-task-stream</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cloud-task-docs</artifactId> <artifactId>spring-cloud-task-docs</artifactId>
<name>Spring Cloud Task Docs</name> <name>Spring Cloud Task Docs</name>

View File

@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Spring Cloud Task Integration Tests</name> <name>Spring Cloud Task Integration Tests</name>
@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@@ -75,7 +75,7 @@
<dependency> <dependency>
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>partitioned-batch-job</artifactId> <artifactId>partitioned-batch-job</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -6,7 +6,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>batch-events</artifactId> <artifactId>batch-events</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Batch Events Sample Application</name> <name>Batch Events Sample Application</name>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -7,7 +7,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>batch-job</artifactId> <artifactId>batch-job</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<description>Spring Cloud Task Batch Example</description> <description>Spring Cloud Task Batch Example</description>
<name>Batch Job Sample Application</name> <name>Batch Job Sample Application</name>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -22,7 +22,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>jpa-sample</artifactId> <artifactId>jpa-sample</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<description>To show users how to enable a task with a JPA application.</description> <description>To show users how to enable a task with a JPA application.</description>
<name>Spring Cloud Task JPA Sample Application</name> <name>Spring Cloud Task JPA Sample Application</name>
@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -7,7 +7,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>multiple-datasources</artifactId> <artifactId>multiple-datasources</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<description>To show users how to enable a task with a multiple DataSources. <description>To show users how to enable a task with a multiple DataSources.
</description> </description>
@@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -8,7 +8,7 @@
<artifactId>partitioned-batch-job</artifactId> <artifactId>partitioned-batch-job</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Partitioned Batch Job</name> <name>Partitioned Batch Job</name>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<description>Sample of using the DeployerPartitionHandler</description> <description>Sample of using the DeployerPartitionHandler</description>
<parent> <parent>
@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@@ -49,7 +49,6 @@
<dependency> <dependency>
<groupId>org.springframework.batch</groupId> <groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-integration</artifactId> <artifactId>spring-batch-integration</artifactId>
<version>4.1.0.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -6,7 +6,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>task-events</artifactId> <artifactId>task-events</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Task Events</name> <name>Task Events</name>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -6,7 +6,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>taskprocessor</artifactId> <artifactId>taskprocessor</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Task Processor Sample Application</name> <name>Task Processor Sample Application</name>
@@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -6,7 +6,7 @@
<groupId>io.spring.cloud</groupId> <groupId>io.spring.cloud</groupId>
<artifactId>tasksink</artifactId> <artifactId>tasksink</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Task Sink Sample Application</name> <name>Task Sink Sample Application</name>
@@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -9,7 +9,7 @@
<artifactId>timestamp-task</artifactId> <artifactId>timestamp-task</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Timestamp Task</name> <name>Timestamp Task</name>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<description>Spring Cloud Timestamp Task</description> <description>Spring Cloud Timestamp Task</description>
<parent> <parent>
@@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-parent</artifactId> <artifactId>spring-cloud-task-parent</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version> <version>2.2.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>