From c4abbbcbbfff028694a68592bffe38b5fc6e6cae Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Thu, 21 Feb 2019 16:52:00 -0500
Subject: [PATCH] Updated Base Version to 2.2.x

Removed Task Dependencies.  These should be brought in by Boot
---
 pom.xml                                       | 20 ++-----------------
 spring-cloud-starter-task/pom.xml             |  2 +-
 spring-cloud-task-batch/pom.xml               |  2 +-
 spring-cloud-task-core/pom.xml                |  2 +-
 spring-cloud-task-dependencies/pom.xml        | 10 +++++-----
 spring-cloud-task-docs/pom.xml                |  2 +-
 spring-cloud-task-integration-tests/pom.xml   |  6 +++---
 .../batch-events/pom.xml                      |  4 ++--
 spring-cloud-task-samples/batch-job/pom.xml   |  4 ++--
 spring-cloud-task-samples/jpa-sample/pom.xml  |  4 ++--
 .../multiple-datasources/pom.xml              |  4 ++--
 .../partitioned-batch-job/pom.xml             |  5 ++---
 spring-cloud-task-samples/pom.xml             |  4 ++--
 spring-cloud-task-samples/task-events/pom.xml |  4 ++--
 .../taskprocessor/pom.xml                     |  4 ++--
 spring-cloud-task-samples/tasksink/pom.xml    |  4 ++--
 spring-cloud-task-samples/timestamp/pom.xml   |  4 ++--
 spring-cloud-task-stream/pom.xml              |  2 +-
 18 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d281f41..325d2960 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-task-parent</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Task Build</name>
 	<description>Spring Cloud Task Build</description>
@@ -59,7 +59,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -76,21 +76,6 @@
 				<version>${spring-cloud-deployer-local.version}</version>
 				<scope>test</scope>
 			</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>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-test-support-internal</artifactId>
@@ -132,7 +117,6 @@
 		</spring-cloud-deployer-local.version>
 		<spring-cloud-stream-binder-rabbit.version>2.1.0.RELEASE
 		</spring-cloud-stream-binder-rabbit.version>
-		<spring-batch.version>4.1.1.RELEASE</spring-batch.version>
 		<commons-logging.version>1.1</commons-logging.version>
 		<java-ee-api.version>8.0</java-ee-api.version>
 		<junit.version>5.3.1</junit.version>
diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml
index bc28b449..e698898e 100644
--- a/spring-cloud-starter-task/pom.xml
+++ b/spring-cloud-starter-task/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-starter-task</artifactId>
diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml
index b53906ca..8007ec7e 100644
--- a/spring-cloud-task-batch/pom.xml
+++ b/spring-cloud-task-batch/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-task-batch</artifactId>
diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml
index 00c966fd..f5606f05 100755
--- a/spring-cloud-task-core/pom.xml
+++ b/spring-cloud-task-core/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-task-core</artifactId>
diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml
index 7d6dc061..25aba87b 100644
--- a/spring-cloud-task-dependencies/pom.xml
+++ b/spring-cloud-task-dependencies/pom.xml
@@ -4,7 +4,7 @@
 		 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>
 	<artifactId>spring-cloud-task-dependencies</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Task Dependencies</name>
 	<description>Spring Cloud Task Dependencies</description>
@@ -21,22 +21,22 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-task</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-core</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-batch</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-stream</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-task-docs/pom.xml b/spring-cloud-task-docs/pom.xml
index 34cc8fb1..a1ced13a 100644
--- a/spring-cloud-task-docs/pom.xml
+++ b/spring-cloud-task-docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-task-docs</artifactId>
 	<name>Spring Cloud Task Docs</name>
diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml
index 8c1e6bf6..67aaa97e 100644
--- a/spring-cloud-task-integration-tests/pom.xml
+++ b/spring-cloud-task-integration-tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-task-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Spring Cloud Task Integration Tests</name>
@@ -19,7 +19,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>io.spring.cloud</groupId>
 			<artifactId>partitioned-batch-job</artifactId>
-			<version>2.1.0.BUILD-SNAPSHOT</version>
+			<version>2.2.0.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml
index 4f495d0f..3a0c1891 100644
--- a/spring-cloud-task-samples/batch-events/pom.xml
+++ b/spring-cloud-task-samples/batch-events/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>batch-events</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Batch Events Sample Application</name>
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml
index b9fa2fe5..33024f8c 100644
--- a/spring-cloud-task-samples/batch-job/pom.xml
+++ b/spring-cloud-task-samples/batch-job/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>batch-job</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<description>Spring Cloud Task Batch Example</description>
 
 	<name>Batch Job Sample Application</name>
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/jpa-sample/pom.xml b/spring-cloud-task-samples/jpa-sample/pom.xml
index 2b785d29..6755c8e1 100644
--- a/spring-cloud-task-samples/jpa-sample/pom.xml
+++ b/spring-cloud-task-samples/jpa-sample/pom.xml
@@ -22,7 +22,7 @@
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>jpa-sample</artifactId>
 	<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>
 
 	<name>Spring Cloud Task JPA Sample Application</name>
@@ -44,7 +44,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/multiple-datasources/pom.xml b/spring-cloud-task-samples/multiple-datasources/pom.xml
index 1fb929aa..ab32af01 100644
--- a/spring-cloud-task-samples/multiple-datasources/pom.xml
+++ b/spring-cloud-task-samples/multiple-datasources/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>multiple-datasources</artifactId>
 	<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>
 
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
index c147d686..67667986 100644
--- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml
+++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
@@ -8,7 +8,7 @@
 	<artifactId>partitioned-batch-job</artifactId>
 	<packaging>jar</packaging>
 	<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>
 
 	<parent>
@@ -28,7 +28,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -49,7 +49,6 @@
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-integration</artifactId>
-			<version>4.1.0.RELEASE</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml
index 01546c87..7af58aa9 100644
--- a/spring-cloud-task-samples/pom.xml
+++ b/spring-cloud-task-samples/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml
index ab2b97e6..b7394d29 100644
--- a/spring-cloud-task-samples/task-events/pom.xml
+++ b/spring-cloud-task-samples/task-events/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>task-events</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Task Events</name>
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index 2f3cbc19..5cd60d6d 100644
--- a/spring-cloud-task-samples/taskprocessor/pom.xml
+++ b/spring-cloud-task-samples/taskprocessor/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>taskprocessor</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Task Processor Sample Application</name>
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 9d9e16e1..5bd520cb 100644
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.spring.cloud</groupId>
 	<artifactId>tasksink</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Task Sink Sample Application</name>
@@ -31,7 +31,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml
index a4eb1fe2..22d8c7d3 100644
--- a/spring-cloud-task-samples/timestamp/pom.xml
+++ b/spring-cloud-task-samples/timestamp/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>timestamp-task</artifactId>
 	<packaging>jar</packaging>
 	<name>Timestamp Task</name>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.BUILD-SNAPSHOT</version>
 	<description>Spring Cloud Timestamp Task</description>
 
 	<parent>
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-task-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml
index 95822144..e877b888 100644
--- a/spring-cloud-task-stream/pom.xml
+++ b/spring-cloud-task-stream/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>