Merge branch '3.3.x'

Closes spring-projectsgh-41990

Author: wilkinsona

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

@@ -175,34 +175,35 @@
     {
       "name": "logging.pattern.console",
       "type": "java.lang.String",
-      "description": "Appender pattern for output to the console. Supported only with the default Logback setup.",
+      "description": "Appender pattern for output to the console.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:-}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+      "defaultValue": "Varies according to the logging system"
     },
     {
       "name": "logging.pattern.correlation",
       "type": "java.lang.String",
-      "description": "Appender pattern for log correlation. Supported only with the default Logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
+      "description": "Appender pattern for log correlation.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "Varies according to the logging system"
     },
     {
       "name": "logging.pattern.dateformat",
       "type": "java.lang.String",
-      "description": "Appender pattern for log date format. Supported only with the default Logback setup.",
+      "description": "Appender pattern for log date format.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"
     },
     {
       "name": "logging.pattern.file",
       "type": "java.lang.String",
-      "description": "Appender pattern for output to a file. Supported only with the default Logback setup.",
+      "description": "Appender pattern for output to a file.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:-} --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"
+      "defaultValue": "Varies according to the logging system"
     },
     {
       "name": "logging.pattern.level",
       "type": "java.lang.String",
-      "description": "Appender pattern for log level. Supported only with the default Logback setup.",
+      "description": "Appender pattern for log level.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": "%5p"
     },