Skip to content

Commit a1109fe

Browse files
version bump 6.8.0 -> 6.8.1 (#42240)
This commit has 2 changes: * version bump 6.8.0 -> 6.8.1 * Ensure CI compatibility now that we aren't building any BWC versions Co-authored-by: Mark Vieira <[email protected]>
1 parent 4db3355 commit a1109fe

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
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.8.0
1+
elasticsearch = 6.8.1
22
lucene = 7.7.0
33

44
# optional dependencies

distribution/bwc/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ import static org.elasticsearch.gradle.BuildPlugin.getJavaHome
3333
* unreleased versions are when Gradle projects are set up, so we use "build-unreleased-version-*" as placeholders
3434
* and configure them to build various versions here.
3535
*/
36+
task buildBwc
37+
3638
bwcVersions.forPreviousUnreleased { VersionCollection.UnreleasedVersionInfo unreleasedVersion -> project("${project.path}:${unreleasedVersion.gradleProjectName}") {
3739
Version bwcVersion = unreleasedVersion.version
3840
String bwcBranch = unreleasedVersion.branch
@@ -192,7 +194,7 @@ bwcVersions.forPreviousUnreleased { VersionCollection.UnreleasedVersionInfo unre
192194
}
193195
}
194196

195-
createRunBwcGradleTask("buildBwcVersion") {
197+
buildBwc.dependsOn createRunBwcGradleTask("buildBwcVersion") {
196198
for (String dir : projectDirs) {
197199
args ":${dir.replace('/', ':')}:assemble"
198200
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ 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_7_3_ID = 6070399;
218-
public static final Version V_6_7_3 = new Version(V_6_7_3_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
219217
public static final int V_6_8_0_ID = 6080099;
220218
public static final Version V_6_8_0 = new Version(V_6_8_0_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
219+
public static final int V_6_8_1_ID = 6080199;
220+
public static final Version V_6_8_1 = new Version(V_6_8_1_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
221221

222-
public static final Version CURRENT = V_6_8_0;
222+
public static final Version CURRENT = V_6_8_1;
223223

224224
static {
225225
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
@@ -232,10 +232,10 @@ public static Version readVersion(StreamInput in) throws IOException {
232232

233233
public static Version fromId(int id) {
234234
switch (id) {
235+
case V_6_8_1_ID:
236+
return V_6_8_1;
235237
case V_6_8_0_ID:
236238
return V_6_8_0;
237-
case V_6_7_3_ID:
238-
return V_6_7_3;
239239
case V_6_7_2_ID:
240240
return V_6_7_2;
241241
case V_6_7_1_ID:

0 commit comments

Comments
 (0)