honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add version 5.6 to versions (#25084)

Browse Source 
* Add version 5.6 to versions

* Fix test

* Remove 5.4.2 constant
This commit is contained in:
Tim Brooks 2017-06-07 08:59:27 -05:00 committed by Jason Tedor
parent d6cb73b5ef
commit 233c63fc63
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/elasticsearch/Version.java
View File

@ -78,10 +78,10 @@ public class Version implements Comparable<Version> {
public static final Version V_5_4_0 = new Version(V_5_4_0_ID, org.apache.lucene.util.Version.LUCENE_6_5_0);
public static final int V_5_4_1_ID = 5040199;
public static final Version V_5_4_1 = new Version(V_5_4_1_ID, org.apache.lucene.util.Version.LUCENE_6_5_1);
public static final int V_5_4_2_ID = 5040299;
public static final Version V_5_4_2 = new Version(V_5_4_2_ID, org.apache.lucene.util.Version.LUCENE_6_5_1);
public static final int V_5_5_0_ID = 5050099;
public static final Version V_5_5_0 = new Version(V_5_5_0_ID, org.apache.lucene.util.Version.LUCENE_6_5_1);
public static final int V_5_6_0_ID = 5060099;
public static final Version V_5_6_0 = new Version(V_5_6_0_ID, org.apache.lucene.util.Version.LUCENE_6_5_1);
public static final int V_6_0_0_alpha1_ID = 6000001;
public static final Version V_6_0_0_alpha1 =
new Version(V_6_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
@ -112,10 +112,10 @@ public class Version implements Comparable<Version> {
return V_6_0_0_alpha2;
case V_6_0_0_alpha1_ID:
return V_6_0_0_alpha1;
case V_5_6_0_ID:
return V_5_6_0;
case V_5_5_0_ID:
return V_5_5_0;
case V_5_4_2_ID:
return V_5_4_2;
case V_5_4_1_ID:
return V_5_4_1;
case V_5_4_0_ID:

2
test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
View File

@ -193,7 +193,7 @@ public class VersionUtilsTests extends ESTestCase {
// This *should* be:
// Version minimumCompatibleVersion = Version.CURRENT.minimumCompatibilityVersion();
// But instead it is:
Version minimumCompatibleVersion = Version.V_5_5_0;
Version minimumCompatibleVersion = Version.V_5_6_0;
// Because things blow up all over the place if the minimum compatible version isn't released.
// We'll fix this very, very soon. But for now, this hack.
// end big horrible hack