From cc98b843a6b0cac0fca9892a5a23596a846c2f1a Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Thu, 25 Oct 2018 11:17:12 +0200 Subject: [PATCH] Bump the 6.x branch to 6.6.0 This commit bumps the 6.x branch of elasticsearch to 6.6.0. --- buildSrc/version.properties | 2 +- docs/Versions.asciidoc | 2 +- server/src/main/java/org/elasticsearch/Version.java | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3a50b7204d2e7..d8cd559cc2def 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 6.5.0 +elasticsearch = 6.6.0 lucene = 7.5.0 # optional dependencies diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 49516efc8dac3..a60f5a37258e9 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,4 +1,4 @@ -:version: 6.5.0 +:version: 6.6.0 :major-version: 6.x :lucene_version: 7.5.0 :lucene_version_path: 7_5_0 diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index e8e19467be009..3d82b51b7a633 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -186,8 +186,10 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_6_4_3 = new Version(V_6_4_3_ID, org.apache.lucene.util.Version.LUCENE_7_4_0); public static final int V_6_5_0_ID = 6050099; public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); + public static final int V_6_6_0_ID = 6060099; + public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); - public static final Version CURRENT = V_6_5_0; + public static final Version CURRENT = V_6_6_0; static { assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to [" @@ -200,6 +202,8 @@ public static Version readVersion(StreamInput in) throws IOException { public static Version fromId(int id) { switch (id) { + case V_6_6_0_ID: + return V_6_6_0; case V_6_5_0_ID: return V_6_5_0; case V_6_4_3_ID: