From dda172e3a44ff3bb9781f92d4f6fbf6d362b6680 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 2 Aug 2021 19:06:46 +0200 Subject: [PATCH] Enable bwc tests now that #74226 has been to 7.x branch. (#75968) --- build.gradle | 4 ++-- .../org/elasticsearch/xpack/deprecation/DeprecationIssue.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d3b0843e893c7..7dd5e75b188b7 100644 --- a/build.gradle +++ b/build.gradle @@ -145,9 +145,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/74226" +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/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationIssue.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationIssue.java index 6fdf6b247ba78..fa8db3ebe553e 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationIssue.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationIssue.java @@ -82,7 +82,7 @@ public DeprecationIssue(StreamInput in) throws IOException { message = in.readString(); url = in.readString(); details = in.readOptionalString(); - resolveDuringRollingUpgrade = in.getVersion().onOrAfter(Version.V_8_0_0) && in.readBoolean(); + resolveDuringRollingUpgrade = in.getVersion().onOrAfter(Version.V_7_15_0) && in.readBoolean(); meta = in.getVersion().onOrAfter(Version.V_7_14_0) ? in.readMap() : null; } @@ -123,7 +123,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(message); out.writeString(url); out.writeOptionalString(details); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_15_0)) { out.writeBoolean(resolveDuringRollingUpgrade); } if (out.getVersion().onOrAfter(Version.V_7_14_0)) {