Merge branch '2.2.x'

Closes gh-21098

spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,5 +1,11 @@
 {
   "properties": [
+    {
+      "name": "spring.devtools.add-properties",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable development property defaults.",
+      "defaultValue": true
+    },
     {
       "name": "spring.devtools.remote.debug.enabled",
       "type": "java.lang.Boolean",
@@ -19,12 +25,6 @@
         "reason": "Remote debug is no longer supported.",
         "level": "error"
       }
-    },
-    {
-      "name": "spring.devtools.add-properties",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable development property defaults.",
-      "defaultValue": true
     }
   ]
 }

spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -7,57 +7,71 @@
   ],
   "properties": [
     {
-      "name": "spring.banner.charset",
+      "name": "banner.charset",
       "type": "java.nio.charset.Charset",
       "description": "Banner file encoding.",
-      "defaultValue": "UTF-8"
+      "defaultValue": "UTF-8",
+      "deprecation": {
+        "replacement": "spring.banner.charset",
+        "level": "error"
+      }
     },
     {
-      "name": "spring.banner.location",
+      "name": "banner.image.height",
+      "type": "java.lang.Integer",
+      "description": "Banner image height (in chars).",
+      "deprecation": {
+        "replacement": "spring.banner.image.height",
+        "level": "error"
+      }
+    },
+    {
+      "name": "banner.image.invert",
+      "type": "java.lang.Boolean",
+      "description": "Invert images for dark console themes.",
+      "defaultValue": false,
+      "deprecation": {
+        "replacement": "spring.banner.image.invert",
+        "level": "error"
+      }
+    },
+    {
+      "name": "banner.image.location",
+      "type": "org.springframework.core.io.Resource",
+      "description": "Banner image file location (jpg/png can also be used).",
+      "defaultValue": "banner.gif",
+      "deprecation": {
+        "replacement": "spring.banner.image.location",
+        "level": "error"
+      }
+    },
+    {
+      "name": "banner.image.margin",
+      "type": "java.lang.Integer",
+      "description": "Left hand image margin (in chars).",
+      "deprecation": {
+        "replacement": "spring.banner.image.margin",
+        "level": "error"
+      }
+    },
+    {
+      "name": "banner.image.width",
+      "type": "java.lang.Integer",
+      "description": "Banner image width (in chars).",
+      "deprecation": {
+        "replacement": "spring.banner.image.width",
+        "level": "error"
+      }
+    },
+    {
+      "name": "banner.location",
       "type": "org.springframework.core.io.Resource",
       "description": "Banner text resource location.",
-      "defaultValue": "classpath:banner.txt"
-    },
-    {
-      "name": "spring.banner.image.location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Banner image file location (jpg or png can also be used).",
-      "defaultValue": "classpath:banner.gif"
-    },
-    {
-      "name": "spring.banner.image.width",
-      "type": "java.lang.Integer",
-      "description": "Width of the banner image in chars.",
-      "defaultValue": 76
-    },
-    {
-      "name": "spring.banner.image.height",
-      "type": "java.lang.Integer",
-      "description": "Height of the banner image in chars (default based on image height)."
-    },
-    {
-      "name": "spring.banner.image.margin",
-      "type": "java.lang.Integer",
-      "description": "Left hand image margin in chars.",
-      "defaultValue": 2
-    },
-    {
-      "name": "spring.banner.image.invert",
-      "type": "java.lang.Boolean",
-      "description": "Whether images should be inverted for dark terminal themes.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.banner.image.bitdepth",
-      "type": "java.lang.Integer",
-      "description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
-      "defaultValue": 4
-    },
-    {
-      "name": "spring.banner.image.pixelmode",
-      "type": "org.springframework.boot.ImageBanner$PixelMode",
-      "description": "The pixel mode to use when rendering the image.",
-      "defaultValue": "TEXT"
+      "defaultValue": "classpath:banner.txt",
+      "deprecation": {
+        "replacement": "spring.banner.location",
+        "level": "error"
+      }
     },
     {
       "name": "debug",
@@ -79,6 +93,15 @@
       "defaultValue": "%wEx",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
+    {
+      "name": "logging.file",
+      "type": "java.lang.String",
+      "description": "Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory.",
+      "deprecation": {
+        "replacement": "logging.file.name",
+        "level": "error"
+      }
+    },
     {
       "name": "logging.file.clean-history-on-start",
       "type": "java.lang.Boolean",
@@ -86,6 +109,20 @@
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": false
     },
+    {
+      "name": "logging.file.max-history",
+      "type": "java.lang.Integer",
+      "description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": 7
+    },
+    {
+      "name": "logging.file.max-size",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Maximum log file size. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "10MB"
+    },
     {
       "name": "logging.file.name",
       "type": "java.lang.String",
@@ -98,20 +135,6 @@
       "description": "Location of the log file. For instance, `/var/log`.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
-    {
-      "name": "logging.file.max-size",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Maximum log file size. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "10MB"
-    },
-    {
-      "name": "logging.file.max-history",
-      "type": "java.lang.Integer",
-      "description": "Maximum number of days archive log files are kept. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": 7
-    },
     {
       "name": "logging.file.total-size-cap",
       "type": "org.springframework.util.unit.DataSize",
@@ -131,6 +154,15 @@
       "description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
+    {
+      "name": "logging.path",
+      "type": "java.lang.String",
+      "description": "Location of the log file. For instance, `/var/log`.",
+      "deprecation": {
+        "replacement": "logging.file.path",
+        "level": "error"
+      }
+    },
     {
       "name": "logging.pattern.console",
       "type": "java.lang.String",
@@ -173,12 +205,74 @@
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": false
     },
+    {
+      "name": "spring.application.index",
+      "type": "java.lang.Integer",
+      "description": "Application index.",
+      "deprecation": {
+        "level": "error",
+        "reason": "Application context ids are now unique by default."
+      }
+    },
     {
       "name": "spring.application.name",
       "type": "java.lang.String",
       "sourceType": "org.springframework.boot.context.ContextIdApplicationContextInitializer",
       "description": "Application name."
     },
+    {
+      "name": "spring.banner.charset",
+      "type": "java.nio.charset.Charset",
+      "description": "Banner file encoding.",
+      "defaultValue": "UTF-8"
+    },
+    {
+      "name": "spring.banner.image.bitdepth",
+      "type": "java.lang.Integer",
+      "description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
+      "defaultValue": 4
+    },
+    {
+      "name": "spring.banner.image.height",
+      "type": "java.lang.Integer",
+      "description": "Height of the banner image in chars (default based on image height)."
+    },
+    {
+      "name": "spring.banner.image.invert",
+      "type": "java.lang.Boolean",
+      "description": "Whether images should be inverted for dark terminal themes.",
+      "defaultValue": false
+    },
+    {
+      "name": "spring.banner.image.location",
+      "type": "org.springframework.core.io.Resource",
+      "description": "Banner image file location (jpg or png can also be used).",
+      "defaultValue": "classpath:banner.gif"
+    },
+    {
+      "name": "spring.banner.image.margin",
+      "type": "java.lang.Integer",
+      "description": "Left hand image margin in chars.",
+      "defaultValue": 2
+    },
+    {
+      "name": "spring.banner.image.pixelmode",
+      "type": "org.springframework.boot.ImageBanner$PixelMode",
+      "description": "The pixel mode to use when rendering the image.",
+      "defaultValue": "TEXT"
+    },
+    {
+      "name": "spring.banner.image.width",
+      "type": "java.lang.Integer",
+      "description": "Width of the banner image in chars.",
+      "defaultValue": 76
+    },
+    {
+      "name": "spring.banner.location",
+      "type": "org.springframework.core.io.Resource",
+      "description": "Banner text resource location.",
+      "defaultValue": "classpath:banner.txt"
+    },
     {
       "name": "spring.beaninfo.ignore",
       "type": "java.lang.Boolean",
@@ -192,6 +286,12 @@
       "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
       "description": "Config file locations used in addition to the defaults."
     },
+    {
+      "name": "spring.config.location",
+      "type": "java.lang.String",
+      "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
+      "description": "Config file locations that replace the defaults."
+    },
     {
       "name": "spring.config.name",
       "type": "java.lang.String",
@@ -199,12 +299,6 @@
       "description": "Config file name.",
       "defaultValue": "application"
     },
-    {
-      "name": "spring.config.location",
-      "type": "java.lang.String",
-      "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
-      "description": "Config file locations that replace the defaults."
-    },
     {
       "name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout",
       "type": "java.lang.Integer",
@@ -709,18 +803,18 @@
       "description": "Configures the ANSI output.",
       "defaultValue": "detect"
     },
-    {
-      "name": "spring.pid.file",
-      "type": "java.lang.String",
-      "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
-      "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
-    },
     {
       "name": "spring.pid.fail-on-write-error",
       "type": "java.lang.Boolean",
       "description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.",
       "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
     },
+    {
+      "name": "spring.pid.file",
+      "type": "java.lang.String",
+      "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
+      "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
+    },
     {
       "name": "spring.profiles",
       "type": "java.util.List<java.lang.String>",
@@ -752,100 +846,6 @@
       "description": "Enable trace logs.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": false
-    },
-    {
-      "name": "banner.charset",
-      "type": "java.nio.charset.Charset",
-      "description": "Banner file encoding.",
-      "defaultValue": "UTF-8",
-      "deprecation": {
-        "replacement": "spring.banner.charset",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.image.height",
-      "type": "java.lang.Integer",
-      "description": "Banner image height (in chars).",
-      "deprecation": {
-        "replacement": "spring.banner.image.height",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.image.invert",
-      "type": "java.lang.Boolean",
-      "description": "Invert images for dark console themes.",
-      "defaultValue": false,
-      "deprecation": {
-        "replacement": "spring.banner.image.invert",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.image.location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Banner image file location (jpg/png can also be used).",
-      "defaultValue": "banner.gif",
-      "deprecation": {
-        "replacement": "spring.banner.image.location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.image.margin",
-      "type": "java.lang.Integer",
-      "description": "Left hand image margin (in chars).",
-      "deprecation": {
-        "replacement": "spring.banner.image.margin",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.image.width",
-      "type": "java.lang.Integer",
-      "description": "Banner image width (in chars).",
-      "deprecation": {
-        "replacement": "spring.banner.image.width",
-        "level": "error"
-      }
-    },
-    {
-      "name": "banner.location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Banner text resource location.",
-      "defaultValue": "classpath:banner.txt",
-      "deprecation": {
-        "replacement": "spring.banner.location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "logging.file",
-      "type": "java.lang.String",
-      "description": "Log file name (for instance, `myapp.log`). Names can be an exact location or relative to the current directory.",
-      "deprecation": {
-        "replacement": "logging.file.name",
-        "level": "error"
-      }
-    },
-    {
-      "name": "logging.path",
-      "type": "java.lang.String",
-      "description": "Location of the log file. For instance, `/var/log`.",
-      "deprecation": {
-        "replacement": "logging.file.path",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.application.index",
-      "type": "java.lang.Integer",
-      "description": "Application index.",
-      "deprecation": {
-        "level": "error",
-        "reason": "Application context ids are now unique by default."
-      }
     }
   ],
   "hints": [
@@ -857,7 +857,6 @@
           "parameters": {
             "group": false
           }
-
         }
       ]
     },
@@ -932,4 +931,3 @@
     }
   ]
 }
-