Merge branch '2.0.x'

2018-05-02 16:08:03 +02:00
parent 44fd7d953e d6244889f5
commit 4eeddbd889
4 changed files with 65 additions and 0 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1209,6 +1209,13 @@
        "level": "error"
      }
    },
+    {
+      "name": "spring.flyway.locations",
+      "type": "java.util.List<java.lang.String>",
+      "defaultValue": [
+        "classpath:db/migration"
+      ]
+    },
    {
      "name": "spring.flyway.sql-migration-suffix",
      "deprecation": {