diff --git a/_includes/cfg/locations-commandline.html b/_includes/cfg/locations-commandline.html new file mode 100644 index 000000000..dc42f335f --- /dev/null +++ b/_includes/cfg/locations-commandline.html @@ -0,0 +1,6 @@ +{% include cfg/_cfg.html name="locations" required=false default='filesystem:<install-dir>/sql' +description="Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
+Unprefixed locations or locations starting with classpath: point to a package on the +classpath and may contain both SQL and Java-based migrations.
+Locations starting with filesystem: point to a directory on the filesystem, may only +contain SQL migrations and are only scanned recursively down non-hidden directories." %} \ No newline at end of file diff --git a/_includes/cfg/locations-maven-gradle.html b/_includes/cfg/locations-maven-gradle.html new file mode 100644 index 000000000..5c08ecae3 --- /dev/null +++ b/_includes/cfg/locations-maven-gradle.html @@ -0,0 +1,5 @@ +{% include cfg/_cfg.html name="locations" required=false default='filesystem:src/main/resources/db/migration' description="Locations to scan recursively for migrations. The location type is determined by its prefix.
+Unprefixed locations or locations starting with classpath: point to a package on the +classpath and may contain both SQL and Java-based migrations.
+Locations starting with filesystem: point to a directory on the filesystem, may only +contain SQL migrations and are only scanned recursively down non-hidden directories." %} \ No newline at end of file diff --git a/documentation/commandline/info.md b/documentation/commandline/info.md index f6296bad8..deb464040 100644 --- a/documentation/commandline/info.md +++ b/documentation/commandline/info.md @@ -71,15 +71,7 @@ Prints the details and status information about all the migrations. the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:<install-dir>/sql - Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. - - + {% include cfg/locations-commandline.html %} jarDirs NO diff --git a/documentation/commandline/migrate.md b/documentation/commandline/migrate.md index 3c4ff8946..8f8488cbf 100644 --- a/documentation/commandline/migrate.md +++ b/documentation/commandline/migrate.md @@ -73,15 +73,7 @@ Migrates the schema to the latest version. Flyway will create the schema history the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:<install-dir>/sql - Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. - - + {% include cfg/locations-commandline.html %} jarDirs NO diff --git a/documentation/commandline/repair.md b/documentation/commandline/repair.md index b178c3740..97452c11f 100644 --- a/documentation/commandline/repair.md +++ b/documentation/commandline/repair.md @@ -74,15 +74,7 @@ Repairs the Flyway schema history table. This will perform the following actions the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:<install-dir>/sql - Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. - - + {% include cfg/locations-commandline.html %} jarDirs NO diff --git a/documentation/commandline/undo.md b/documentation/commandline/undo.md index 8bea0ae44..8fff408ce 100644 --- a/documentation/commandline/undo.md +++ b/documentation/commandline/undo.md @@ -73,15 +73,7 @@ subtitle: 'Command-line: undo' the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:<install-dir>/sql - Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. - - + {% include cfg/locations-commandline.html %} jarDirs NO diff --git a/documentation/commandline/validate.md b/documentation/commandline/validate.md index 2e6fb75e3..643fe7611 100644 --- a/documentation/commandline/validate.md +++ b/documentation/commandline/validate.md @@ -77,15 +77,7 @@ Validation fails if the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:<install-dir>/sql - Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. - - + {% include cfg/locations-commandline.html %} jarDirs NO diff --git a/documentation/configfiles.md b/documentation/configfiles.md index cc40571f0..2bbf0684f 100644 --- a/documentation/configfiles.md +++ b/documentation/configfiles.md @@ -88,8 +88,9 @@ flyway.url= # Comma-separated list of locations to scan recursively for migrations. (default: filesystem:<>/sql) # The location type is determined by its prefix. # Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain -# both sql and java-based migrations. -# Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. +# both SQL and Java-based migrations. +# Locations starting with filesystem: point to a directory on the filesystem, may only +# contain SQL migrations and are only scanned recursively down non-hidden directories. # flyway.locations= # Comma-separated list of fully qualified class names of custom MigrationResolver to use for resolving migrations. diff --git a/documentation/envvars.md b/documentation/envvars.md index 4a29abdc2..5770c204a 100644 --- a/documentation/envvars.md +++ b/documentation/envvars.md @@ -71,8 +71,10 @@ The following environment variables are supported: FLYWAY_LOCATIONS Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only contain sql migrations. + Unprefixed locations or locations starting with classpath: point to a package on the + classpath and may contain both SQL and Java-based migrations.
+ Locations starting with filesystem: point to a directory on the filesystem, may only + contain SQL migrations and are only scanned recursively down non-hidden directories. diff --git a/documentation/gradle/info.md b/documentation/gradle/info.md index cbb3cefbf..28b2b5578 100644 --- a/documentation/gradle/info.md +++ b/documentation/gradle/info.md @@ -71,17 +71,7 @@ Prints the details and status information about all the migrations. the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/gradle/migrate.md b/documentation/gradle/migrate.md index 5de59b9fa..1b31a4da1 100644 --- a/documentation/gradle/migrate.md +++ b/documentation/gradle/migrate.md @@ -71,17 +71,7 @@ Migrates the schema to the latest version. Flyway will create the schema history the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/gradle/repair.md b/documentation/gradle/repair.md index 31e00d0de..c84d6014e 100644 --- a/documentation/gradle/repair.md +++ b/documentation/gradle/repair.md @@ -71,17 +71,7 @@ Repairs the Flyway schema history table. This will perform the following actions the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/gradle/undo.md b/documentation/gradle/undo.md index b913d049e..f8539a01e 100644 --- a/documentation/gradle/undo.md +++ b/documentation/gradle/undo.md @@ -71,17 +71,7 @@ subtitle: 'gradle flywayUndo' the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/gradle/validate.md b/documentation/gradle/validate.md index 595035f41..420872720 100644 --- a/documentation/gradle/validate.md +++ b/documentation/gradle/validate.md @@ -77,17 +77,7 @@ Validation fails if the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/maven/info.md b/documentation/maven/info.md index 31bed7fbe..86d9e67f7 100644 --- a/documentation/maven/info.md +++ b/documentation/maven/info.md @@ -80,17 +80,7 @@ Prints the details and status information about all the migrations. the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/maven/migrate.md b/documentation/maven/migrate.md index 336645845..735487b61 100644 --- a/documentation/maven/migrate.md +++ b/documentation/maven/migrate.md @@ -86,17 +86,7 @@ Migrates the schema to the latest version. Flyway will create the schema history the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/maven/repair.md b/documentation/maven/repair.md index c8a7b10fb..7531fe7c3 100644 --- a/documentation/maven/repair.md +++ b/documentation/maven/repair.md @@ -80,17 +80,7 @@ Repairs the Flyway schema history table. This will perform the following actions the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/maven/undo.md b/documentation/maven/undo.md index 9a513795f..9dd946664 100644 --- a/documentation/maven/undo.md +++ b/documentation/maven/undo.md @@ -82,17 +82,7 @@ subtitle: 'mvn flyway:undo' the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/maven/validate.md b/documentation/maven/validate.md index 1e9951a8a..9c8109b5a 100644 --- a/documentation/maven/validate.md +++ b/documentation/maven/validate.md @@ -90,17 +90,7 @@ Validation fails if the schema history table is placed in the first schema of the list. - - locations - NO - filesystem:src/main/resources/db/migration - Locations to scan recursively for migrations. The location type is determined by its prefix.
- Unprefixed locations or locations starting with classpath: point to a package on the - classpath and may contain both sql and java-based migrations.
- Locations starting with filesystem: point to a directory on the filesystem and may only - contain sql migrations. - - + {% include cfg/locations-maven-gradle.html %} sqlMigrationPrefix NO diff --git a/documentation/releaseNotes.html b/documentation/releaseNotes.html index abe1fd19f..cc1522d8d 100644 --- a/documentation/releaseNotes.html +++ b/documentation/releaseNotes.html @@ -29,6 +29,11 @@

New features

{% include issue.html id="2144" title="Command-line: Bundle MySQL JDBC driver" %} +

Incompatible Changes

+ +

Changes

- Thanks to Daniel Scott, DanskerDave, Fabian Bergmark, Gili Tzabari, Guy Brand, + Thanks to Daniel Scott, DanskerDave, Elvadas NONO, Fabian Bergmark, Gili Tzabari, Guy Brand, hdconradi, HiddenKnowledge, JeP42, JLopeDeB, Joe Lee-Moyet, Matt Sprague, Matthew Burghoffer, Mihir Mehta, Reinhard Handler, Sajith1988V, Tim Hadwen and Valentin Gohard for reporting these issues.