Merge branch '2.4.x'

Closes gh-24861
spring-projects · Jan 17, 2021 · dcae55a · dcae55a
2 parents 600be08 + f7c855d
commit dcae55a
Showing 1 changed file with 2 additions and 2 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
@@ -21,12 +21,12 @@
     },
     {
       "name": "logging.charset.console",
-      "type": "java.nio.Charset",
+      "type": "java.nio.charset.Charset",
       "description": "Charset to use for console output."
     },
     {
       "name": "logging.charset.file",
-      "type": "java.nio.Charset",
+      "type": "java.nio.charset.Charset",
       "description": "Charset to use for file output."
     },
     {