Merge branch '3.2.x' into 3.3.x

Closes gh-42881
spring-projects · Oct 25, 2024 · 8556001 · 8556001
2 parents afd0b45 + 4718485
commit 8556001
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -168,16 +168,14 @@
     {
       "name": "logging.pattern.console",
       "type": "java.lang.String",
-      "description": "Appender pattern for output to the console.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "Varies according to the logging system"
+      "description": "Appender pattern for output to the console. Its default value varies according to the logging system.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
     {
       "name": "logging.pattern.correlation",
       "type": "java.lang.String",
-      "description": "Appender pattern for log correlation.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "Varies according to the logging system"
+      "description": "Appender pattern for log correlation. Its default value varies according to the logging system.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
     {
       "name": "logging.pattern.dateformat",
@@ -189,9 +187,8 @@
     {
       "name": "logging.pattern.file",
       "type": "java.lang.String",
-      "description": "Appender pattern for output to a file.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "Varies according to the logging system"
+      "description": "Appender pattern for output to a file. Its default value varies according to the logging system.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
     {
       "name": "logging.pattern.level",