Merge pull request #18637 from AlexFalappa

* pr/18637:
  Narrow type for Tomcat 'locale' and 'encoding' properties

Closes gh-18637

Author: snicoll

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

@@ -2170,6 +2170,28 @@
         }
       ]
     },
+    {
+      "name": "server.tomcat.accesslog.encoding",
+      "providers": [
+        {
+          "name": "handle-as",
+          "parameters": {
+            "target": "java.nio.charset.Charset"
+          }
+        }
+      ]
+    },
+    {
+      "name": "server.tomcat.accesslog.locale",
+      "providers": [
+        {
+          "name": "handle-as",
+          "parameters": {
+            "target": "java.util.Locale"
+          }
+        }
+      ]
+    },
     {
       "name": "spring.liquibase.change-log",
       "providers": [