1
0
Эх сурвалжийг харах

Prepare master branch to be 6.0.0-alpha1

Simon Willnauer 9 жил өмнө
parent
commit
f319545814

+ 1 - 1
buildSrc/version.properties

@@ -1,4 +1,4 @@
-elasticsearch     = 5.0.0-alpha6
+elasticsearch     = 6.0.0-alpha1
 lucene            = 6.2.0
 
 # optional dependencies

+ 9 - 1
core/src/main/java/org/elasticsearch/Version.java

@@ -89,7 +89,11 @@ public class Version {
     public static final Version V_5_0_0_alpha6 = new Version(V_5_0_0_alpha6_ID, org.apache.lucene.util.Version.LUCENE_6_2_0);
     public static final int V_5_0_0_beta1_ID = 5000026;
     public static final Version V_5_0_0_beta1 = new Version(V_5_0_0_beta1_ID, org.apache.lucene.util.Version.LUCENE_6_2_0);
-    public static final Version CURRENT = V_5_0_0_beta1;
+    public static final int V_5_0_0_ID = 5000099;
+    public static final Version V_5_0_0 = new Version(V_5_0_0_ID, org.apache.lucene.util.Version.LUCENE_6_2_0);
+    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_6_2_0);
+    public static final Version CURRENT = V_6_0_0_alpha1;
 
     static {
         assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
@@ -102,6 +106,10 @@ public class Version {
 
     public static Version fromId(int id) {
         switch (id) {
+            case V_6_0_0_alpha1_ID:
+                return V_6_0_0_alpha1;
+            case V_5_0_0_ID:
+                return V_5_0_0;
             case V_5_0_0_beta1_ID:
                 return V_5_0_0_beta1;
             case V_5_0_0_alpha6_ID:

+ 1 - 0
core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java

@@ -184,6 +184,7 @@ public class OldIndexBackwardsCompatibilityIT extends ESIntegTestCase {
         SortedSet<String> expectedVersions = new TreeSet<>();
         for (Version v : VersionUtils.allVersions()) {
             if (VersionUtils.isSnapshot(v)) continue;  // snapshots are unreleased, so there is no backcompat yet
+            if (v.onOrBefore(Version.V_5_0_0)) continue; // we have not yet released this
             if (v.isAlpha()) continue; // no guarantees for alpha releases
             if (v.onOrBefore(Version.V_2_0_0_beta1)) continue; // we can only test back one major lucene version
             if (v.equals(Version.CURRENT)) continue; // the current version is always compatible with itself

+ 1 - 1
qa/backwards-5.0/build.gradle

@@ -18,6 +18,6 @@ integTest {
   cluster {
     numNodes = 2
     numBwcNodes = 1
-    bwcVersion = "5.0.0-alpha6-SNAPSHOT" // this is the same as the current version until we released the first RC
+    bwcVersion = "6.0.0-alpha1-SNAPSHOT" // this is the same as the current version until we released the first RC
   }
 }