Merge branch '2.6.x' into 2.7.x

Closes gh-30437
2022-03-25 14:56:01 +01:00
parent 8646ac4215 c003d5b533
commit 45f393b76b
5 changed files with 153 additions and 147 deletions
--- a/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,4 +1,5 @@
 {
+  "groups": [],
  "properties": [
    {
      "name": "spring.devtools.add-properties",
@@ -6,5 +7,6 @@
      "description": "Whether to enable development property defaults.",
      "defaultValue": true
    }
-  ]
+  ],
+  "hints": []
 }