Merge branch '2.4.x'

snicoll · snicoll · commit dcae55a8bc8d · 2021-01-17T17:04:22.000+01:00
Closes gh-24861
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
@@ -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."
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"name": "logging.charset.console",`
`24`		`- "type": "java.nio.Charset",`
	`24`	`+ "type": "java.nio.charset.Charset",`
`25`	`25`	`"description": "Charset to use for console output."`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"name": "logging.charset.file",`
`29`		`- "type": "java.nio.Charset",`
	`29`	`+ "type": "java.nio.charset.Charset",`
`30`	`30`	`"description": "Charset to use for file output."`
`31`	`31`	`},`
`32`	`32`	`{`