From 2b8e5799f730d84daae8ad4a77b4c8300ff691c0 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@pivotal.io>
Date: Tue, 7 Feb 2017 14:27:19 -0600
Subject: [PATCH] Upgraded to Camden SR5

This commit upgrades Spring Cloud Task to Camden SR5 and makes the
required changes to do so.

Resolves #276
---
 pom.xml                                            | 14 +++++++-------
 spring-cloud-task-batch/pom.xml                    |  6 ------
 spring-cloud-task-dependencies/pom.xml             |  2 +-
 spring-cloud-task-samples/batch-events/pom.xml     |  8 ++++----
 spring-cloud-task-samples/batch-job/pom.xml        |  2 +-
 .../partitioned-batch-job/pom.xml                  |  4 ++--
 spring-cloud-task-samples/task-events/pom.xml      |  4 ++--
 spring-cloud-task-samples/taskprocessor/pom.xml    |  6 +++---
 spring-cloud-task-samples/tasksink/pom.xml         |  8 ++++----
 .../configuration/TaskSinkConfiguration.java       |  6 ++++++
 spring-cloud-task-samples/timestamp/pom.xml        |  2 +-
 spring-cloud-task-stream/pom.xml                   |  6 ++++++
 12 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2834327..d34bf49f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<version>1.2.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -132,12 +132,12 @@
 	</modules>
 
 	<properties>
-		<spring-cloud-stream.version>1.1.0.RELEASE</spring-cloud-stream.version>
-		<spring-cloud-deployer-spi.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
-		<spring-cloud-deployer-local.version>1.1.0.RELEASE</spring-cloud-deployer-local.version>
-		<spring-cloud-stream-binder-rabbit.version>1.1.1.RELEASE</spring-cloud-stream-binder-rabbit.version>
-		<spring-cloud-deployer-resource-support.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-support.version>
-		<spring-cloud-deployer-resource-maven.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-maven.version>
+		<spring-cloud-stream.version>1.1.1.RELEASE</spring-cloud-stream.version>
+		<spring-cloud-deployer-spi.version>1.1.3.RELEASE</spring-cloud-deployer-spi.version>
+		<spring-cloud-deployer-local.version>1.1.3.RELEASE</spring-cloud-deployer-local.version>
+		<spring-cloud-stream-binder-rabbit.version>1.1.2.RELEASE</spring-cloud-stream-binder-rabbit.version>
+		<spring-cloud-deployer-resource-support.version>1.1.3.RELEASE</spring-cloud-deployer-resource-support.version>
+		<spring-cloud-deployer-resource-maven.version>1.1.3.RELEASE</spring-cloud-deployer-resource-maven.version>
 		<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml
index 97f94958..51380f22 100644
--- a/spring-cloud-task-batch/pom.xml
+++ b/spring-cloud-task-batch/pom.xml
@@ -44,12 +44,6 @@
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-integration</artifactId>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml
index 49232287..c8f98e79 100644
--- a/spring-cloud-task-dependencies/pom.xml
+++ b/spring-cloud-task-dependencies/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.2.1.RELEASE</version>
+		<version>1.2.2.RELEASE</version>
         <relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml
index 767ee82f..1d55ed36 100644
--- a/spring-cloud-task-samples/batch-events/pom.xml
+++ b/spring-cloud-task-samples/batch-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -51,19 +51,19 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-			<version>1.1.0.RELEASE</version>
+			<version>1.1.1.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml
index fe4014d8..c7f6426c 100644
--- a/spring-cloud-task-samples/batch-job/pom.xml
+++ b/spring-cloud-task-samples/batch-job/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml
index fa391943..f8ef81f5 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-local</artifactId>
-			<version>1.1.0.RELEASE</version>
+			<version>1.1.3.RELEASE</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml
index 8c79f667..24441c2a 100644
--- a/spring-cloud-task-samples/task-events/pom.xml
+++ b/spring-cloud-task-samples/task-events/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index dc398a7c..36f206f5 100644
--- a/spring-cloud-task-samples/taskprocessor/pom.xml
+++ b/spring-cloud-task-samples/taskprocessor/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support</artifactId>
-			<version>1.1.0.RELEASE</version>
+			<version>1.1.1.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 8f955390..597beec2 100644
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-local</artifactId>
-			<version>1.1.0.RELEASE</version>
+			<version>1.1.3.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-test-support</artifactId>
-			<version>1.1.0.RELEASE</version>
+			<version>1.1.1.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java
index 2defb583..3d7f2ea1 100644
--- a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java
+++ b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/configuration/TaskSinkConfiguration.java
@@ -57,6 +57,12 @@ public class TaskSinkConfiguration {
 			TaskStatus taskStatus = new TaskStatus(taskLaunchId, state, null);
 			return taskStatus;
 		}
+
+		@Override
+		public void cleanup(String id) {}
+
+		@Override
+		public void destroy(String appName) {}
 	}
 
 }
diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml
index a0d5cffc..4974da8f 100644
--- a/spring-cloud-task-samples/timestamp/pom.xml
+++ b/spring-cloud-task-samples/timestamp/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.4.2.RELEASE</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml
index f20cadf7..5381da3f 100644
--- a/spring-cloud-task-stream/pom.xml
+++ b/spring-cloud-task-stream/pom.xml
@@ -41,6 +41,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-deployer-spi</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>