From 03139f066b080e42421aafa9b8656e5a5add893b Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 16 Jan 2020 14:42:38 +0100
Subject: [PATCH] Polish "Remove deprecated logging properties"

See gh-19699
---
 ...itional-spring-configuration-metadata.json | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 5bbca0c280..06d811582a 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -79,16 +79,6 @@
       "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.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "deprecation": {
-        "replacement": "logging.file.name",
-        "level": "error"
-      }
-    },
     {
       "name": "logging.file.clean-history-on-start",
       "type": "java.lang.Boolean",
@@ -141,16 +131,6 @@
       "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`.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "deprecation": {
-        "replacement": "logging.file.path",
-        "level": "error"
-      }
-    },
     {
       "name": "logging.pattern.console",
       "type": "java.lang.String",
@@ -835,6 +815,24 @@
         "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",