From c67273b513d5488014076a4f6b4fb8d210f9b8be Mon Sep 17 00:00:00 2001 From: Joe Lee-Moyet Date: Fri, 31 Aug 2018 17:26:09 +0100 Subject: [PATCH 1/2] Add an 'ignorePendingMigrations' configuration option --- .../src/main/assembly/flyway.conf | 7 ++++ .../java/org/flywaydb/commandline/Main.java | 1 + .../main/java/org/flywaydb/core/Flyway.java | 33 +++++++++++++++-- .../configuration/ClassicConfiguration.java | 36 +++++++++++++++++++ .../core/api/configuration/Configuration.java | 12 +++++++ .../configuration/FluentConfiguration.java | 20 +++++++++++ .../internal/configuration/ConfigUtils.java | 6 ++++ .../org/flywaydb/gradle/FlywayExtension.java | 12 +++++++ .../gradle/task/AbstractFlywayTask.java | 13 +++++++ .../flywaydb/maven/AbstractFlywayMojo.java | 13 +++++++ 10 files changed, 150 insertions(+), 3 deletions(-) diff --git a/flyway-commandline/src/main/assembly/flyway.conf b/flyway-commandline/src/main/assembly/flyway.conf index ea50fb00d5..b2f49ec458 100644 --- a/flyway-commandline/src/main/assembly/flyway.conf +++ b/flyway-commandline/src/main/assembly/flyway.conf @@ -210,6 +210,13 @@ flyway.url= # true to continue normally, false to fail fast with an exception. (default: false) # flyway.ignoreIgnoredMigrations= +# Ignore pending migrations when reading the schema history table. These are migrations that are available on the +# classpath but have not yet been were performed by an application deployment. +# This can be useful for verifying that in-development migration changes don't contain any validation-breaking changes +# of migrations that have already been applied to a production environment, e.g. as part of a CI/CD process, without +# failing because of the existence of new migration versions. (default: false) +# flyway.ignorePendingMigrations= + # Ignore future migrations when reading the schema history table. These are migrations that were performed by a # newer deployment of the application that are not yet available in this version. For example: we have migrations # available on the classpath up to version 3.0. The schema history table indicates that a migration to version 4.0 diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java index 1ad5f21647..4707acf829 100644 --- a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java +++ b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java @@ -283,6 +283,7 @@ private static void printUsage() { LOG.info("validateOnMigrate : Validate when running migrate"); LOG.info("ignoreMissingMigrations : Allow missing migrations when validating"); LOG.info("ignoreIgnoredMigrations : Allow ignored migrations when validating"); + LOG.info("ignorePendingMigrations : Allow pending migrations when validating"); LOG.info("ignoreFutureMigrations : Allow future migrations when validating"); LOG.info("cleanOnValidationError : Automatically clean on a validation error"); LOG.info("cleanDisabled : Whether to disable clean"); diff --git a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java index 6f6957bf4a..c5ffc3323a 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java +++ b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java @@ -309,6 +309,15 @@ public boolean isIgnoreIgnoredMigrations() { return configuration.isIgnoreIgnoredMigrations(); } + /** + * @deprecated Direct configuration of the Flyway object has been deprecated and will be removed in Flyway 6.0. Use Flyway.configure() instead. + */ + @Deprecated + @Override + public boolean isIgnorePendingMigrations() { + return configuration.isIgnorePendingMigrations(); + } + /** * @deprecated Direct configuration of the Flyway object has been deprecated and will be removed in Flyway 6.0. Use Flyway.configure() instead. */ @@ -670,6 +679,22 @@ public void setIgnoreIgnoredMigrations(boolean ignoreIgnoredMigrations) { configuration.setIgnoreIgnoredMigrations(ignoreIgnoredMigrations); } + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + * + * @param ignorePendingMigrations {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + * @deprecated Direct configuration of the Flyway object has been deprecated and will be removed in Flyway 6.0. Use Flyway.configure() instead. + */ + @Deprecated + public void setIgnorePendingMigrations(boolean ignorePendingMigrations) { + configuration.setIgnorePendingMigrations(ignorePendingMigrations); + } + /** * Whether to ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations @@ -1327,13 +1352,15 @@ public Void execute(MigrationResolver migrationResolver, SchemaHistory schemaHis * @param schemaHistory The schema history table. * @param schemas The schemas managed by Flyway. * @param callbackExecutor The callback executor. - * @param pending Whether pending migrations are ok. + * @param aboutToMigrate Whether migrations are about to be run (and therefore to ignore pending migrations + * regardless of the ignorePendingMigrations configuration property) */ private void doValidate(Database database, MigrationResolver migrationResolver, - SchemaHistory schemaHistory, Schema[] schemas, CallbackExecutor callbackExecutor, boolean pending) { + SchemaHistory schemaHistory, Schema[] schemas, CallbackExecutor callbackExecutor, boolean aboutToMigrate) { String validationError = new DbValidate(database, schemaHistory, schemas[0], migrationResolver, - configuration.getTarget(), configuration.isOutOfOrder(), pending, + configuration.getTarget(), configuration.isOutOfOrder(), + aboutToMigrate || configuration.isIgnorePendingMigrations(), configuration.isIgnoreMissingMigrations(), configuration.isIgnoreIgnoredMigrations(), configuration.isIgnoreFutureMigrations(), diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java index 7f3d92c78e..6be453abdb 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java @@ -207,6 +207,18 @@ public class ClassicConfiguration implements Configuration { */ private boolean ignoreIgnoredMigrations; + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. + * This can be useful for verifying that in-development migration changes don't contain any validation-breaking changes + * of migrations that have already been applied to a production environment, e.g. as part of a CI/CD process, without + * failing because of the existence of new migration versions. + *

+ * {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + private boolean ignorePendingMigrations; + /** * Ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations @@ -484,6 +496,11 @@ public boolean isIgnoreIgnoredMigrations() { return ignoreIgnoredMigrations; } + @Override + public boolean isIgnorePendingMigrations() { + return ignorePendingMigrations; + } + @Override public boolean isIgnoreFutureMigrations() { return ignoreFutureMigrations; @@ -828,6 +845,20 @@ public void setIgnoreMissingMigrations(boolean ignoreMissingMigrations) { public void setIgnoreIgnoredMigrations(boolean ignoreIgnoredMigrations) { this.ignoreIgnoredMigrations = ignoreIgnoredMigrations; } + + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + * + * @param ignorePendingMigrations {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + public void setIgnorePendingMigrations(boolean ignorePendingMigrations) { + this.ignorePendingMigrations = ignorePendingMigrations; + } /** * Whether to ignore future migrations when reading the schema history table. These are migrations that were performed by a @@ -1391,6 +1422,7 @@ public void configure(Configuration configuration) { setIgnoreFutureMigrations(configuration.isIgnoreFutureMigrations()); setIgnoreMissingMigrations(configuration.isIgnoreMissingMigrations()); setIgnoreIgnoredMigrations(configuration.isIgnoreIgnoredMigrations()); + setIgnorePendingMigrations(configuration.isIgnorePendingMigrations()); setInstalledBy(configuration.getInstalledBy()); setLocations(configuration.getLocations()); setMixed(configuration.isMixed()); @@ -1547,6 +1579,10 @@ public void configure(Map props) { if (ignoreIgnoredMigrationsProp != null) { setIgnoreIgnoredMigrations(ignoreIgnoredMigrationsProp); } + Boolean ignorePendingMigrationsProp = getBooleanProp(props, ConfigUtils.IGNORE_PENDING_MIGRATIONS); + if (ignorePendingMigrationsProp != null) { + setIgnorePendingMigrations(ignorePendingMigrationsProp); + } Boolean ignoreFutureMigrationsProp = getBooleanProp(props, ConfigUtils.IGNORE_FUTURE_MIGRATIONS); if (ignoreFutureMigrationsProp != null) { setIgnoreFutureMigrations(ignoreFutureMigrationsProp); diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java index f6f1c17398..e3d5094e40 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java @@ -273,6 +273,18 @@ public interface Configuration { */ boolean isIgnoreIgnoredMigrations(); + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + * + * @return {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + boolean isIgnorePendingMigrations(); + /** * Ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java index 32b7dccfb8..5f37a5eb8b 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java @@ -149,6 +149,11 @@ public boolean isIgnoreIgnoredMigrations() { return config.isIgnoreIgnoredMigrations(); } + @Override + public boolean isIgnorePendingMigrations() { + return config.isIgnorePendingMigrations(); + } + @Override public boolean isIgnoreFutureMigrations() { return config.isIgnoreFutureMigrations(); @@ -415,6 +420,21 @@ public FluentConfiguration ignoreIgnoredMigrations(boolean ignoreIgnoredMigratio return this; } + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + * + * @param ignorePendingMigrations {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + public FluentConfiguration ignorePendingMigrations(boolean ignorePendingMigrations) { + config.setIgnorePendingMigrations(ignorePendingMigrations); + return this; + } + /** * Whether to ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java b/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java index 3e4260101f..63f6d336c6 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java +++ b/flyway-core/src/main/java/org/flywaydb/core/internal/configuration/ConfigUtils.java @@ -78,6 +78,7 @@ public class ConfigUtils { public static final String IGNORE_FUTURE_MIGRATIONS = "flyway.ignoreFutureMigrations"; public static final String IGNORE_MISSING_MIGRATIONS = "flyway.ignoreMissingMigrations"; public static final String IGNORE_IGNORED_MIGRATIONS = "flyway.ignoreIgnoredMigrations"; + public static final String IGNORE_PENDING_MIGRATIONS = "flyway.ignorePendingMigrations"; public static final String INSTALLED_BY = "flyway.installedBy"; public static final String LICENSE_KEY = "flyway.licenseKey"; public static final String LOCATIONS = "flyway.locations"; @@ -266,6 +267,11 @@ public boolean isIgnoreIgnoredMigrations() { return configuration.isIgnoreIgnoredMigrations(); } + @Override + public boolean isIgnorePendingMigrations() { + return configuration.isIgnorePendingMigrations(); + } + @Override public boolean isIgnoreFutureMigrations() { return configuration.isIgnoreFutureMigrations(); diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java index f0dea6990e..66240e2962 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java @@ -233,6 +233,18 @@ public class FlywayExtension { */ public Boolean ignoreIgnoredMigrations; + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + *

+ * {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + public Boolean ignorePendingMigrations; + /** * Ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java index c151bf88fe..278620e113 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java @@ -273,6 +273,18 @@ public abstract class AbstractFlywayTask extends DefaultTask { */ public Boolean ignoreIgnoredMigrations; + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + *

+ * {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + public Boolean ignorePendingMigrations; + /** * Ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations @@ -551,6 +563,7 @@ private Map createFlywayConfig(Map envVars) { putIfSet(conf, ConfigUtils.CLEAN_ON_VALIDATION_ERROR, cleanOnValidationError, extension.cleanOnValidationError); putIfSet(conf, ConfigUtils.IGNORE_MISSING_MIGRATIONS, ignoreMissingMigrations, extension.ignoreMissingMigrations); putIfSet(conf, ConfigUtils.IGNORE_IGNORED_MIGRATIONS, ignoreIgnoredMigrations, extension.ignoreIgnoredMigrations); + putIfSet(conf, ConfigUtils.IGNORE_PENDING_MIGRATIONS, ignorePendingMigrations, extension.ignorePendingMigrations); putIfSet(conf, ConfigUtils.IGNORE_FUTURE_MIGRATIONS, ignoreFutureMigrations, extension.ignoreFutureMigrations); putIfSet(conf, ConfigUtils.CLEAN_DISABLED, cleanDisabled, extension.cleanDisabled); putIfSet(conf, ConfigUtils.BASELINE_ON_MIGRATE, baselineOnMigrate, extension.baselineOnMigrate); diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java index c2c7fd3e97..75a0fd674c 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java @@ -304,6 +304,19 @@ abstract class AbstractFlywayMojo extends AbstractMojo { @Parameter(property = ConfigUtils.IGNORE_IGNORED_MIGRATIONS) private Boolean ignoreIgnoredMigrations; + /** + * Ignore pending migrations when reading the schema history table. These are migrations that are available on the + * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * that in-development migration changes don't contain any validation-breaking changes of migrations that have + * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the + * existence of new migration versions. + *

+ * {@code true} to continue normally, {@code false} to fail fast with an exception. + * (default: {@code false}) + */ + @Parameter(property = ConfigUtils.IGNORE_PENDING_MIGRATIONS) + private Boolean ignorePendingMigrations; + /** * Ignore future migrations when reading the schema history table. These are migrations that were performed by a * newer deployment of the application that are not yet available in this version. For example: we have migrations From 9031c92f85f9aa6916d424f9318d3e6ff1bce21a Mon Sep 17 00:00:00 2001 From: Joe Lee-Moyet Date: Mon, 3 Sep 2018 10:57:28 +0100 Subject: [PATCH 2/2] Fix bad documentation copy edit for ignorePendingMigrations option --- flyway-commandline/src/main/assembly/flyway.conf | 2 +- flyway-core/src/main/java/org/flywaydb/core/Flyway.java | 2 +- .../flywaydb/core/api/configuration/ClassicConfiguration.java | 4 ++-- .../org/flywaydb/core/api/configuration/Configuration.java | 2 +- .../flywaydb/core/api/configuration/FluentConfiguration.java | 2 +- .../src/main/java/org/flywaydb/gradle/FlywayExtension.java | 2 +- .../java/org/flywaydb/gradle/task/AbstractFlywayTask.java | 2 +- .../src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flyway-commandline/src/main/assembly/flyway.conf b/flyway-commandline/src/main/assembly/flyway.conf index b2f49ec458..ccf0d416cb 100644 --- a/flyway-commandline/src/main/assembly/flyway.conf +++ b/flyway-commandline/src/main/assembly/flyway.conf @@ -211,7 +211,7 @@ flyway.url= # flyway.ignoreIgnoredMigrations= # Ignore pending migrations when reading the schema history table. These are migrations that are available on the -# classpath but have not yet been were performed by an application deployment. +# classpath but have not yet been performed by an application deployment. # This can be useful for verifying that in-development migration changes don't contain any validation-breaking changes # of migrations that have already been applied to a production environment, e.g. as part of a CI/CD process, without # failing because of the existence of new migration versions. (default: false) diff --git a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java index c5ffc3323a..64568807f7 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/Flyway.java +++ b/flyway-core/src/main/java/org/flywaydb/core/Flyway.java @@ -681,7 +681,7 @@ public void setIgnoreIgnoredMigrations(boolean ignoreIgnoredMigrations) { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java index 6be453abdb..f59c4801f8 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/ClassicConfiguration.java @@ -209,7 +209,7 @@ public class ClassicConfiguration implements Configuration { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. + * classpath but have not yet been performed by an application deployment. * This can be useful for verifying that in-development migration changes don't contain any validation-breaking changes * of migrations that have already been applied to a production environment, e.g. as part of a CI/CD process, without * failing because of the existence of new migration versions. @@ -848,7 +848,7 @@ public void setIgnoreIgnoredMigrations(boolean ignoreIgnoredMigrations) { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java index e3d5094e40..689f124279 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/Configuration.java @@ -275,7 +275,7 @@ public interface Configuration { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java index 5f37a5eb8b..9287c37df4 100644 --- a/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java +++ b/flyway-core/src/main/java/org/flywaydb/core/api/configuration/FluentConfiguration.java @@ -422,7 +422,7 @@ public FluentConfiguration ignoreIgnoredMigrations(boolean ignoreIgnoredMigratio /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java index 66240e2962..c75980fe02 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/FlywayExtension.java @@ -235,7 +235,7 @@ public class FlywayExtension { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java index 278620e113..68bd15129d 100644 --- a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java +++ b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/AbstractFlywayTask.java @@ -275,7 +275,7 @@ public abstract class AbstractFlywayTask extends DefaultTask { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions. diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java index 75a0fd674c..4f5b39d38d 100644 --- a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java +++ b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/AbstractFlywayMojo.java @@ -306,7 +306,7 @@ abstract class AbstractFlywayMojo extends AbstractMojo { /** * Ignore pending migrations when reading the schema history table. These are migrations that are available on the - * classpath but have not yet been were performed by an application deployment. This can be useful for verifying + * classpath but have not yet been performed by an application deployment. This can be useful for verifying * that in-development migration changes don't contain any validation-breaking changes of migrations that have * already been applied to a production environment, e.g. as part of a CI/CD process, without failing because of the * existence of new migration versions.