From 083d0b6781e5cb5c1f597d6c541516999fe74f4d Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Tue, 15 Nov 2016 12:32:17 +0530
Subject: [PATCH] Activate `local` profile to enable local deployer

 This is based on https://github.com/spring-cloud/spring-cloud-deployer-local/pull/4
---
 pom.xml                                                         | 2 +-
 .../dataflow/server/config/DataFlowServerConfiguration.java     | 2 +-
 .../src/main/resources/dataflow-server.yml                      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65848bca5b..f3d63dd86a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 		<java.version>1.8</java.version>
 		<spring-cloud-dataflow-ui.version>1.1.0.RC1</spring-cloud-dataflow-ui.version>
 		<spring-cloud-deployer.version>1.1.0.RC1</spring-cloud-deployer.version>
-		<spring-cloud-deployer-local.version>1.1.0.RC1</spring-cloud-deployer-local.version>
+		<spring-cloud-deployer-local.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-deployer-local.version>
 		<spring-cloud-task.version>1.1.0.RC1</spring-cloud-task.version>
 		<spring-cloud.version>Camden.SR2</spring-cloud.version>
 		<spring-framework.version>4.3.3.RELEASE</spring-framework.version>
diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java
index 1d50347c4b..9aa367a7cc 100644
--- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowServerConfiguration.java
@@ -70,7 +70,7 @@
 @Import({CompletionConfiguration.class, FeaturesConfiguration.class, WebConfiguration.class})
 @ComponentScan(basePackageClasses = { StreamDefinitionRepository.class, BasicAuthSecurityConfiguration.class})
 @EnableAutoConfiguration(exclude=SessionAutoConfiguration.class)
-@EnableConfigurationProperties({BatchProperties.class, CommonApplicationProperties.class})
+@EnableConfigurationProperties({FeaturesProperties.class, BatchProperties.class, CommonApplicationProperties.class})
 public class DataFlowServerConfiguration {
 
 	@Configuration
diff --git a/spring-cloud-starter-dataflow-server-local/src/main/resources/dataflow-server.yml b/spring-cloud-starter-dataflow-server-local/src/main/resources/dataflow-server.yml
index cb9137d302..f68899724c 100644
--- a/spring-cloud-starter-dataflow-server-local/src/main/resources/dataflow-server.yml
+++ b/spring-cloud-starter-dataflow-server-local/src/main/resources/dataflow-server.yml
@@ -19,6 +19,8 @@ maven:
       url: https://repo.spring.io/libs-snapshot
 
 spring:
+  profiles:
+    active: local
   application:
     name: spring-cloud-dataflow-server-local
   cloud: