diff --git a/build.gradle b/build.gradle index 78c06074c82d7..1569cec42e9a5 100644 --- a/build.gradle +++ b/build.gradle @@ -132,9 +132,9 @@ tasks.register("verifyVersions") { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false +boolean bwc_tests_enabled = true // place a PR link here when committing bwc changes: -String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/78951" +String bwc_tests_disabled_issue = "" /* * FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a * JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable diff --git a/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java b/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java index dc89e88605d4b..96f0884a36052 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java +++ b/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java @@ -38,7 +38,7 @@ */ public class FeatureMigrationResults implements Metadata.Custom { public static final String TYPE = "system_index_migration"; - private static final Version MIGRATION_ADDED_VERSION = Version.V_8_0_0; + public static final Version MIGRATION_ADDED_VERSION = Version.V_8_0_0; private static final ParseField RESULTS_FIELD = new ParseField("results"); diff --git a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskParams.java b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskParams.java index 3f63b29c64a79..94530d73d1b6d 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskParams.java +++ b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskParams.java @@ -17,6 +17,8 @@ import java.io.IOException; +import static org.elasticsearch.upgrades.FeatureMigrationResults.MIGRATION_ADDED_VERSION; + /** * The params used to initialize {@link SystemIndexMigrator} when it's initially kicked off. * @@ -62,7 +64,7 @@ public String getWriteableName() { @Override public Version getMinimalSupportedVersion() { - return Version.V_8_0_0; + return MIGRATION_ADDED_VERSION; } @Override public boolean equals(Object obj) {