From 39b0b5809d17bd437afad33366bd991971125985 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 1 May 2019 16:19:42 -0400 Subject: [PATCH] Fix minimum compatible version after 6.8 This commit fixes the minimum compatible version after the introduction of 6.8. --- server/src/test/java/org/elasticsearch/VersionTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/VersionTests.java b/server/src/test/java/org/elasticsearch/VersionTests.java index 99077cbea70..3d601de9b47 100644 --- a/server/src/test/java/org/elasticsearch/VersionTests.java +++ b/server/src/test/java/org/elasticsearch/VersionTests.java @@ -186,7 +186,7 @@ public class VersionTests extends ESTestCase { // from 7.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is // released since we need to bump the supported minor in Version#minimumCompatibilityVersion() - Version lastVersion = Version.V_6_7_0; // TODO: remove this once min compat version is a constant instead of method + Version lastVersion = Version.V_6_8_0; // TODO: remove this once min compat version is a constant instead of method assertEquals(lastVersion.major, Version.V_7_0_0.minimumCompatibilityVersion().major); assertEquals("did you miss to bump the minor in Version#minimumCompatibilityVersion()", lastVersion.minor, Version.V_7_0_0.minimumCompatibilityVersion().minor); @@ -346,7 +346,8 @@ public class VersionTests extends ESTestCase { public void testIsCompatible() { assertTrue(isCompatible(Version.CURRENT, Version.CURRENT.minimumCompatibilityVersion())); assertFalse(isCompatible(Version.V_6_6_0, Version.V_7_0_0)); - assertTrue(isCompatible(Version.V_6_7_0, Version.V_7_0_0)); + assertFalse(isCompatible(Version.V_6_7_0, Version.V_7_0_0)); + assertTrue(isCompatible(Version.V_6_8_0, Version.V_7_0_0)); assertFalse(isCompatible(Version.fromId(2000099), Version.V_7_0_0)); assertFalse(isCompatible(Version.fromId(2000099), Version.V_6_5_0));