From 685e4aabee4e124d16e598019063c995aa3e8233 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Mon, 21 Mar 2016 21:51:56 -0400
Subject: [PATCH] Changes to support putting SCDF back onto snapshot

* Only configure the BatchListener if the Job.class has a bean instance
* Add the task-batch to the task-dependencies pom.
---
 .../batch/configuration/TaskBatchAutoConfiguration.java     | 6 +++---
 spring-cloud-task-dependencies/pom.xml                      | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
index 607e766c..a015babd 100644
--- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
+++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
@@ -16,14 +16,14 @@
 package org.springframework.cloud.task.batch.configuration;
 
 import java.util.Collection;
+
 import javax.sql.DataSource;
 
 import org.springframework.batch.core.Job;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.task.batch.listener.TaskBatchExecutionListener;
-import org.springframework.cloud.task.configuration.EnableTask;
 import org.springframework.cloud.task.repository.TaskExplorer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,7 +35,7 @@ import org.springframework.util.CollectionUtils;
  * @author Michael Minella
  */
 @Configuration
-@ConditionalOnClass({Job.class, EnableTask.class})
+@ConditionalOnBean({Job.class})
 public class TaskBatchAutoConfiguration {
 
 	@Bean
diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml
index 52f27202..37b1ffa4 100644
--- a/spring-cloud-task-dependencies/pom.xml
+++ b/spring-cloud-task-dependencies/pom.xml
@@ -22,6 +22,11 @@
 				<artifactId>spring-cloud-task-core</artifactId>
 				<version>1.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-task-batch</artifactId>
+				<version>1.0.0.BUILD-SNAPSHOT</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>