honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add 1.0.1 revision (#1152) (#1160) 

This commit stages the branch to the next 1.0.1 patch release. BWC testing needs
this even if the next revision is never actually released.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize 2021-08-26 07:10:24 -05:00 committed by GitHub
parent ec05dcdcf0
commit 079fd77062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/bwcVersions
View File

@ -75,3 +75,4 @@ BWC_VERSION:
- "7.10.1" - "7.10.1"
- "7.10.2" - "7.10.2"
- "1.0.0" - "1.0.0"
- "1.0.1"

1
server/src/main/java/org/opensearch/Version.java
View File

@ -71,6 +71,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST); public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2); public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2);
public static final Version V_1_0_1 = new Version(1000199, org.apache.lucene.util.Version.LUCENE_8_8_2);
public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0); public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0);
public static final Version CURRENT = V_1_1_0; public static final Version CURRENT = V_1_1_0;

7
test/framework/src/main/java/org/opensearch/test/VersionUtils.java
View File

@ -95,8 +95,12 @@ public class VersionUtils {
// remove last minor unless the it's the first OpenSearch version. // remove last minor unless the it's the first OpenSearch version.
// all Legacy ES versions are released, so we don't exclude any. // all Legacy ES versions are released, so we don't exclude any.
if (current.equals(Version.V_1_0_0) == false) { if (current.equals(Version.V_1_0_0) == false) {
List<Version> lastMinorLine = stableVersions.get(stableVersions.size() - 1);
if (lastMinorLine.get(lastMinorLine.size() - 1) instanceof LegacyESVersion == false) {
// if the last minor line is Legacy there are no more staged releases; do nothing
Version lastMinor = moveLastToUnreleased(stableVersions, unreleasedVersions); Version lastMinor = moveLastToUnreleased(stableVersions, unreleasedVersions);
if (lastMinor.revision == 0) { if (lastMinor instanceof LegacyESVersion == false && lastMinor.revision == 0) {
// no more staged legacy versions
if (stableVersions.get(stableVersions.size() - 1).size() == 1) { if (stableVersions.get(stableVersions.size() - 1).size() == 1) {
// a minor is being staged, which is also unreleased // a minor is being staged, which is also unreleased
moveLastToUnreleased(stableVersions, unreleasedVersions); moveLastToUnreleased(stableVersions, unreleasedVersions);
@ -107,6 +111,7 @@ public class VersionUtils {
} }
} }
} }
}
// If none of the previous major was released, then the last minor and bugfix of the old version was not released either. // If none of the previous major was released, then the last minor and bugfix of the old version was not released either.
if (previousMajor.isEmpty()) { if (previousMajor.isEmpty()) {