From 86ff69e20e773bd981e66cb2f4d1bad9742e69f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Tue, 20 Mar 2018 16:09:05 +0100 Subject: [PATCH 1/2] Version: bump to 6.1.5 --- buildSrc/version.properties | 2 +- core/src/main/java/org/elasticsearch/Version.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index bee028931f3dc..bdc69ac6734ae 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy -elasticsearch = 6.1.4 +elasticsearch = 6.1.5 lucene = 7.1.0 # optional dependencies diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index a70394cb21d27..e7ead471d166d 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -148,7 +148,9 @@ public class Version implements Comparable { public static final Version V_6_1_3 = new Version(V_6_1_3_ID, org.apache.lucene.util.Version.LUCENE_7_1_0); public static final int V_6_1_4_ID = 6010499; public static final Version V_6_1_4 = new Version(V_6_1_4_ID, org.apache.lucene.util.Version.LUCENE_7_1_0); - public static final Version CURRENT = V_6_1_4; + public static final int V_6_1_5_ID = 6010599; + public static final Version V_6_1_5 = new Version(V_6_1_5_ID, org.apache.lucene.util.Version.LUCENE_7_1_0); + public static final Version CURRENT = V_6_1_5; static { assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to [" @@ -161,6 +163,8 @@ public static Version readVersion(StreamInput in) throws IOException { public static Version fromId(int id) { switch (id) { + case V_6_1_5_ID: + return V_6_1_5; case V_6_1_4_ID: return V_6_1_4; case V_6_1_3_ID: From a21dfbeedf8434e4fac5a01534a00180546709b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Tue, 20 Mar 2018 16:21:29 +0100 Subject: [PATCH 2/2] Removing outdate comment --- buildSrc/version.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index bdc69ac6734ae..554c04b00c274 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,4 +1,3 @@ -# When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy elasticsearch = 6.1.5 lucene = 7.1.0