Remove the need for _UNRELEASED suffix in versions

build.gradle

@@ -62,7 +62,12 @@ configure(subprojects.findAll { it.projectDir.toPath().startsWith(rootPath) }) {
   }
 }
 
-// introspect all versions of ES that may be tested agains for backwards compatibility
+/* Introspect all versions of ES that may be tested agains for backwards
+ * compatibility. It is *super* important that this logic is the same as the
+ * logic in VersionUtils.java, modulo alphas, betas, and rcs which are ignored
+ * in gradle because they don't have any backwards compatibility guarantees
+ * but are not ignored in VersionUtils.java because the tests expect them not
+ * to be. */
 Version currentVersion = Version.fromString(VersionProperties.elasticsearch.minus('-SNAPSHOT'))
 int prevMajor = currentVersion.major - 1
 File versionFile = file('core/src/main/java/org/elasticsearch/Version.java')
@@ -72,13 +77,14 @@ List<Version> versions = []
 int prevMinorIndex = -1 // index in the versions list of the last minor from the prev major
 int lastPrevMinor = -1 // the minor version number from the prev major we most recently seen
 for (String line : versionLines) {
-  Matcher match = line =~ /\W+public static final Version V_(\d+)_(\d+)_(\d+)(_UNRELEASED)? .*/
+  /* Note that this skips alphas and betas which is fine because they aren't
+   * compatible with anything. */
+  Matcher match = line =~ /\W+public static final Version V_(\d+)_(\d+)_(\d+) .*/
   if (match.matches()) {
     int major = Integer.parseInt(match.group(1))
     int minor = Integer.parseInt(match.group(2))
     int bugfix = Integer.parseInt(match.group(3))
-    boolean unreleased = match.group(4) != null
-    Version foundVersion = new Version(major, minor, bugfix, false, unreleased)
+    Version foundVersion = new Version(major, minor, bugfix, false)
     if (currentVersion != foundVersion) {
       versions.add(foundVersion)
     }
@@ -98,8 +104,11 @@ if (currentVersion.bugfix == 0) {
   // unreleased version of closest branch. So for those cases, the version includes -SNAPSHOT,
   // and the bwc-zip distribution will checkout and build that version.
   Version last = versions[-1]
-  versions[-1] = new Version(last.major, last.minor, last.bugfix,
-      true, last.unreleased)
+  versions[-1] = new Version(last.major, last.minor, last.bugfix, true)
+  if (last.bugfix == 0) {
+    versions[-2] = new Version(
+        versions[-2].major, versions[-2].minor, versions[-2].bugfix, true)
+  }
 }
 
 // injecting groovy property variables into all projects

buildSrc/src/main/groovy/org/elasticsearch/gradle/Version.groovy

@@ -29,20 +29,14 @@ public class Version {
     final int bugfix
     final int id
     final boolean snapshot
-    /**
-     * Is the vesion listed as {@code _UNRELEASED} in Version.java.
-     */
-    final boolean unreleased
 
-    public Version(int major, int minor, int bugfix, boolean snapshot,
-            boolean unreleased) {
+    public Version(int major, int minor, int bugfix, boolean snapshot) {
         this.major = major
         this.minor = minor
         this.bugfix = bugfix
         this.snapshot = snapshot
         this.id = major * 100000 + minor * 1000 + bugfix * 10 +
             (snapshot ? 1 : 0)
-        this.unreleased = unreleased
     }
 
     public static Version fromString(String s) {
@@ -54,7 +48,7 @@ public class Version {
             bugfix = bugfix.split('-')[0]
         }
         return new Version(parts[0] as int, parts[1] as int, bugfix as int,
-            snapshot, false)
+            snapshot)
     }
 
     @Override

core/build.gradle

@@ -290,7 +290,7 @@ task('verifyVersions') {
     }
     Set<String> knownVersions = new TreeSet<>(xml.versioning.versions.version.collect { it.text() }.findAll { it ==~ /\d\.\d\.\d/ })
 
-    // Limit the known versions to those that should be wire compatible
+    // Limit the known versions to those that should be index compatible
     String currentVersion = versions.elasticsearch.minus('-SNAPSHOT')
     int prevMajor = Integer.parseInt(currentVersion.split('\\.')[0]) - 1
     if (prevMajor == 4) {
@@ -305,9 +305,11 @@ task('verifyVersions') {
      * as possible after release. */
     Set<String> actualVersions = new TreeSet<>(
       indexCompatVersions
-        .findAll { false == it.unreleased }
+        .findAll { false == it.snapshot }
         .collect { it.toString() })
 
+    // TODO this is almost certainly going to fail on 5.4 when we release 5.5.0
+
     // Finally, compare!
     if (!knownVersions.equals(actualVersions)) {
       throw new GradleException("out-of-date versions\nActual  :" +

core/src/main/java/org/elasticsearch/Version.java

@@ -74,15 +74,17 @@ public class Version implements Comparable<Version> {
     public static final Version V_5_3_2 = new Version(V_5_3_2_ID, org.apache.lucene.util.Version.LUCENE_6_4_2);
     public static final int V_5_4_0_ID = 5040099;
     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_5_0_ID_UNRELEASED = 5050099;
-    public static final Version V_5_5_0_UNRELEASED = new Version(V_5_5_0_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_6_5_0);
-    public static final int V_6_0_0_alpha1_ID_UNRELEASED = 6000001;
-    public static final Version V_6_0_0_alpha1_UNRELEASED =
-            new Version(V_6_0_0_alpha1_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_7_0_0);
-    public static final int V_6_0_0_alpha2_ID_UNRELEASED = 6000002;
-    public static final Version V_6_0_0_alpha2_UNRELEASED =
-            new Version(V_6_0_0_alpha2_ID_UNRELEASED, org.apache.lucene.util.Version.LUCENE_7_0_0);
-    public static final Version CURRENT = V_6_0_0_alpha2_UNRELEASED;
+    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_0);
+    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_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_7_0_0);
+    public static final int V_6_0_0_alpha2_ID = 6000002;
+    public static final Version V_6_0_0_alpha2 =
+            new Version(V_6_0_0_alpha2_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
+    public static final Version CURRENT = V_6_0_0_alpha2;
 
     // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
 
@@ -97,12 +99,14 @@ public static Version readVersion(StreamInput in) throws IOException {
 
     public static Version fromId(int id) {
         switch (id) {
-            case V_6_0_0_alpha2_ID_UNRELEASED:
-                return V_6_0_0_alpha2_UNRELEASED;
-            case V_6_0_0_alpha1_ID_UNRELEASED:
-                return V_6_0_0_alpha1_UNRELEASED;
-            case V_5_5_0_ID_UNRELEASED:
-                return V_5_5_0_UNRELEASED;
+            case V_6_0_0_alpha2_ID:
+                return V_6_0_0_alpha2;
+            case V_6_0_0_alpha1_ID:
+                return V_6_0_0_alpha1;
+            case V_5_5_0_ID:
+                return V_5_5_0;
+            case V_5_4_1_ID:
+                return V_5_4_1;
             case V_5_4_0_ID:
                 return V_5_4_0;
             case V_5_3_2_ID:

core/src/main/java/org/elasticsearch/action/DocWriteResponse.java

@@ -261,7 +261,7 @@ public void readFrom(StreamInput in) throws IOException {
         type = in.readString();
         id = in.readString();
         version = in.readZLong();
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             seqNo = in.readZLong();
             primaryTerm = in.readVLong();
         } else {
@@ -279,7 +279,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(type);
         out.writeString(id);
         out.writeZLong(version);
-        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             out.writeZLong(seqNo);
             out.writeVLong(primaryTerm);
         }

core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java

@@ -79,7 +79,7 @@ public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         clusterName = new ClusterName(in);
         clusterState = ClusterState.readFrom(in, null);
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             totalCompressedSize = new ByteSizeValue(in);
         } else {
             // in a mixed cluster, if a pre 6.0 node processes the get cluster state
@@ -95,7 +95,7 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         clusterName.writeTo(out);
         clusterState.writeTo(out);
-        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             totalCompressedSize.writeTo(out);
         }
     }

core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java

@@ -492,7 +492,7 @@ public void readFrom(StreamInput in) throws IOException {
         for (int i = 0; i < size; i++) {
             final String type = in.readString();
             String source = in.readString();
-            if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO change to 5.3.0 after backport
+            if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO change to 5.3.0 after backport
                 // we do not know the content type that comes from earlier versions so we autodetect and convert
                 source = XContentHelper.convertToJson(new BytesArray(source), false, false, XContentFactory.xContentType(source));
             }

core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -308,7 +308,7 @@ public void readFrom(StreamInput in) throws IOException {
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         type = in.readOptionalString();
         source = in.readString();
-        if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO change to V_5_3 once backported
+        if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO change to V_5_3 once backported
             // we do not know the format from earlier versions so convert if necessary
             source = XContentHelper.convertToJson(new BytesArray(source), false, false, XContentFactory.xContentType(source));
         }

core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java

@@ -21,6 +21,7 @@
 
 import com.carrotsearch.hppc.cursors.IntObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionResponse;
@@ -34,7 +35,6 @@
 import org.elasticsearch.common.io.stream.Streamable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.shard.ShardStateMetaData;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -165,7 +165,7 @@ public static StoreStatus readStoreStatus(StreamInput in) throws IOException {
         @Override
         public void readFrom(StreamInput in) throws IOException {
             node = new DiscoveryNode(in);
-            if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) {
+            if (in.getVersion().before(Version.V_6_0_0_alpha1)) {
                 // legacy version
                 in.readLong();
             }
@@ -179,7 +179,7 @@ public void readFrom(StreamInput in) throws IOException {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             node.writeTo(out);
-            if (out.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) {
+            if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
                 // legacy version
                 out.writeLong(-1L);
             }

core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java

@@ -104,7 +104,7 @@ public void readFrom(StreamInput in) throws IOException {
         statePath = in.readString();
         dataPath = in.readString();
         isCustomDataPath = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             seqNoStats = in.readOptionalWriteable(SeqNoStats::new);
         }
     }
@@ -117,7 +117,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(statePath);
         out.writeString(dataPath);
         out.writeBoolean(isCustomDataPath);
-        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             out.writeOptionalWriteable(seqNoStats);
         }
     }

core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java

@@ -475,7 +475,7 @@ public void readFrom(StreamInput in) throws IOException {
         cause = in.readString();
         name = in.readString();
 
-        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             indexPatterns = in.readList(StreamInput::readString);
         } else {
             indexPatterns = Collections.singletonList(in.readString());
@@ -487,7 +487,7 @@ public void readFrom(StreamInput in) throws IOException {
         for (int i = 0; i < size; i++) {
             final String type = in.readString();
             String mappingSource = in.readString();
-            if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO change to V_5_3_0 once backported
+            if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO change to V_5_3_0 once backported
                 // we do not know the incoming type so convert it if needed
                 mappingSource =
                     XContentHelper.convertToJson(new BytesArray(mappingSource), false, false, XContentFactory.xContentType(mappingSource));
@@ -512,7 +512,7 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeString(cause);
         out.writeString(name);
-        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
             out.writeStringList(indexPatterns);
         } else {
             out.writeString(indexPatterns.size() > 0 ? indexPatterns.get(0) : "");

core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java

@@ -78,7 +78,7 @@ public void readFrom(StreamInput in) throws IOException {
         if (in.readBoolean()) {
             primaryResponse = BulkItemResponse.readBulkItem(in);
         }
-        if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO remove once backported
+        if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
             boolean ignoreOnReplica = in.readBoolean();
             if (ignoreOnReplica == false && primaryResponse != null) {
                 assert primaryResponse.isFailed() == false : "expected no failure on the primary response";
@@ -89,7 +89,7 @@ public void readFrom(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(id);
-        if (out.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO remove once backported
+        if (out.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
             // old nodes expect updated version and version type on the request
             if (primaryResponse != null) {
                 request.version(primaryResponse.getVersion());
@@ -102,7 +102,7 @@ public void writeTo(StreamOutput out) throws IOException {
             DocWriteRequest.writeDocumentRequest(out, request);
         }
         out.writeOptionalStreamable(primaryResponse);
-        if (out.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) { // TODO remove once backported
+        if (out.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
             if (primaryResponse != null) {
                 out.writeBoolean(primaryResponse.isFailed()
                         || primaryResponse.getResponse().getResult() == DocWriteResponse.Result.NOOP);

core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java

@@ -211,7 +211,7 @@ public Failure(StreamInput in) throws IOException {
             id = in.readOptionalString();
             cause = in.readException();
             status = ExceptionsHelper.status(cause);
-            if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+            if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
                 seqNo = in.readZLong();
             } else {
                 seqNo = SequenceNumbersService.UNASSIGNED_SEQ_NO;
@@ -224,7 +224,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(getType());
             out.writeOptionalString(getId());
             out.writeException(getCause());
-            if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
+            if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1)) {
                 out.writeZLong(getSeqNo());
             }
         }

core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java

@@ -78,7 +78,7 @@ void setMergeResults(boolean mergeResults) {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         fields = in.readStringArray();
-        if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_5_5_0)) {
             indices = in.readStringArray();
             indicesOptions = IndicesOptions.readIndicesOptions(in);
             mergeResults = in.readBoolean();
@@ -91,7 +91,7 @@ public void readFrom(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(fields);
-        if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_5_5_0)) {
             out.writeStringArray(indices);
             indicesOptions.writeIndicesOptions(out);
             out.writeBoolean(mergeResults);

core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java

@@ -86,7 +86,7 @@ public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         this.responseMap =
             in.readMap(StreamInput::readString, FieldCapabilitiesResponse::readField);
-        if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (in.getVersion().onOrAfter(Version.V_5_5_0)) {
             indexResponses = in.readList(FieldCapabilitiesIndexResponse::new);
         } else {
             indexResponses = Collections.emptyList();
@@ -101,7 +101,7 @@ private static Map<String, FieldCapabilities> readField(StreamInput in) throws I
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeMap(responseMap, StreamOutput::writeString, FieldCapabilitiesResponse::writeField);
-        if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
+        if (out.getVersion().onOrAfter(Version.V_5_5_0)) {
             out.writeList(indexResponses);
         }
 

core/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -523,7 +523,7 @@ public void readFrom(StreamInput in) throws IOException {
         id = in.readOptionalString();
         routing = in.readOptionalString();
         parent = in.readOptionalString();
-        if (in.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (in.getVersion().before(Version.V_6_0_0_alpha1)) {
             in.readOptionalString(); // timestamp
             in.readOptionalWriteable(TimeValue::new); // ttl
         }
@@ -548,7 +548,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalString(id);
         out.writeOptionalString(routing);
         out.writeOptionalString(parent);
-        if (out.getVersion().before(Version.V_6_0_0_alpha1_UNRELEASED)) {
+        if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
             // Serialize a fake timestamp. 5.x expect this value to be set by the #process method so we can't use null.
             // On the other hand, indices created on 5.x do not index the timestamp field.  Therefore passing a 0 (or any value) for
             // the transport layer OK as it will be ignored.