Merge branch '2.7.x'

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

@@ -792,6 +792,41 @@
       "defaultValue": "default"
     },
     {
+      "name" : "spring.datasource.continue-on-error",
+      "type" : "java.lang.Boolean",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.continue-on-error"
+      }
+    }, {
+      "name" : "spring.datasource.data",
+      "type" : "java.util.List<java.lang.String>",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.data-locations"
+      }
+    }, {
+      "name" : "spring.datasource.data-password",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.password"
+      }
+    }, {
+      "name" : "spring.datasource.data-username",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.username"
+      }
+    }, {
+      "name" : "spring.datasource.initialization-mode",
+      "type" : "org.springframework.boot.jdbc.DataSourceInitializationMode",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.mode"
+      }
+    }, {
       "name": "spring.datasource.jmx-enabled",
       "type": "java.lang.Boolean",
       "description": "Whether to enable JMX support (if provided by the underlying pool).",
@@ -800,8 +835,49 @@
         "level": "error",
         "replacement": "spring.datasource.tomcat.jmx-enabled"
       }
-    },
-    {
+    }, {
+      "name" : "spring.datasource.platform",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.platform"
+      }
+    }, {
+      "name" : "spring.datasource.schema",
+      "type" : "java.util.List<java.lang.String>",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.schema-locations"
+      }
+    }, {
+      "name" : "spring.datasource.schema-password",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.password"
+      }
+    }, {
+      "name" : "spring.datasource.schema-username",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.username"
+      }
+    }, {
+      "name" : "spring.datasource.separator",
+      "type" : "java.lang.String",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.separator"
+      }
+    }, {
+      "name" : "spring.datasource.sql-script-encoding",
+      "type" : "java.nio.charset.Charset",
+      "deprecation" : {
+        "level" : "error",
+        "replacement": "spring.sql.init.encoding"
+      }
+    }, {
       "name": "spring.elasticsearch.jest.connection-timeout",
       "type": "java.time.Duration",
       "description": "Connection timeout.",