From 16e213089675b012701ead0b054ac20f018dfd0f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sat, 8 Nov 2014 16:22:00 +0000
Subject: [PATCH] Add missing properties metadata

Fixes gh-1829
---
 .../additional-spring-configuration-metadata.json    | 12 ++++++++++++
 .../additional-spring-configuration-metadata.json    |  2 +-
 .../additional-spring-configuration-metadata.json    | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b636a87aab3..13431300071 100644
--- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,4 +1,16 @@
 {"properties": [
+  {
+    "name": "endpoints.configprops.keys-to-sanitize",
+    "dataType": "java.lang.String",
+    "sourceType": "org.springframework.boot.actuate.endpoint.ConfigurationPropertiesReportEndpoint",
+    "description": "The keys that should be sanitize. Keys can be simple strings that the property ends with or regex expressions."
+  },
+  {
+    "name": "endpoints.env.keys-to-sanitize",
+    "dataType": "java.lang.String",
+    "sourceType": "org.springframework.boot.actuate.endpoint.EnvironmentEndpoint",
+    "description": "The keys that should be sanitize. Keys can be simple strings that the property ends with or regex expressions."
+  },
   {
     "name": "management.health.db.enabled",
     "dataType": "java.lang.Boolean",
diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 97c2ffac69f..d16a04433fc 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -12,7 +12,7 @@
     "defaultValue": false
   },
   {
-    "name": "spring.batch.enabled",
+    "name": "spring.batch.job.enabled",
     "dataType": "java.lang.Boolean",
     "description": "Execute all Spring Batch jobs in the context on startup.",
     "defaultValue": true
diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index e1f214fd6db..16ccc1237fa 100644
--- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -68,6 +68,16 @@
     "dataType": "java.lang.Boolean",
     "sourceType": "org.springframework.boot.SpringApplication",
     "description": "Run the application in a web environment (auto-detected by default)"
+  },
+  {
+    "name": "spring.profiles.active",
+    "dataType": "java.lang.String",
+    "description": "Set the active profiles as a comma separated list. Can be overridden by a command line switch."
+  },
+  {
+    "name": "spring.profiles.include",
+    "dataType": "java.lang.String",
+    "description": "Unconditionally activate the specified comma separated profiles."
   }
 ]}