Skip to content

Commit f55f3cf

Browse files
committed
Add 6.8 version constants
This commit adds the 6.8 version constants and bumps the current version on the 6.8 branch to 6.8.0.
1 parent 01c6b23 commit f55f3cf

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 6.7.2
1+
elasticsearch = 6.8.0
22
lucene = 7.7.0
33

44
# optional dependencies

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
:version: 6.7.1
1+
:version: 6.8.0
22
:major-version: 6.x
33
:lucene_version: 7.7.0
44
:lucene_version_path: 7_7_0
5-
:branch: 6.7
5+
:branch: 6.8
66
:jdk: 1.8.0_131
77
:jdk_major: 8
88
:build_flavor: default

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
214214
public static final Version V_6_7_1 = new Version(V_6_7_1_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
215215
public static final int V_6_7_2_ID = 6070299;
216216
public static final Version V_6_7_2 = new Version(V_6_7_2_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
217+
public static final int V_6_8_0_ID = 6080099;
218+
public static final Version V_6_8_0 = new Version(V_6_8_0_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
217219

218-
public static final Version CURRENT = V_6_7_2;
220+
public static final Version CURRENT = V_6_8_0;
219221

220222
static {
221223
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
@@ -228,6 +230,8 @@ public static Version readVersion(StreamInput in) throws IOException {
228230

229231
public static Version fromId(int id) {
230232
switch (id) {
233+
case V_6_8_0_ID:
234+
return V_6_8_0;
231235
case V_6_7_2_ID:
232236
return V_6_7_2;
233237
case V_6_7_1_ID:

0 commit comments

Comments
 (0)