Skip to content

Commit 1d59eaf

Browse files
authored
Bump version to 1.0.1 revision (#1151)
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 <[email protected]>
1 parent 8daa06f commit 1d59eaf

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

.ci/bwcVersions

+1
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,4 @@ BWC_VERSION:
7474
- "7.10.0"
7575
- "7.10.1"
7676
- "7.10.2"
77+
- "1.0.0"

buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opensearch = 1.0.0
1+
opensearch = 1.0.1
22
lucene = 8.8.2
33

44
bundled_jdk_vendor = adoptopenjdk

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
7171
public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
7272

7373
public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2);
74-
public static final Version CURRENT = V_1_0_0;
74+
public static final Version V_1_0_1 = new Version(1000199, org.apache.lucene.util.Version.LUCENE_8_8_2);
75+
public static final Version CURRENT = V_1_0_1;
7576

7677
public static Version readVersion(StreamInput in) throws IOException {
7778
return fromId(in.readVInt());

test/framework/src/main/java/org/opensearch/test/VersionUtils.java

+14-9
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,20 @@ static Tuple<List<Version>, List<Version>> resolveReleasedVersions(Version curre
9595
// remove last minor unless the it's the first OpenSearch version.
9696
// all Legacy ES versions are released, so we don't exclude any.
9797
if (current.equals(Version.V_1_0_0) == false) {
98-
Version lastMinor = moveLastToUnreleased(stableVersions, unreleasedVersions);
99-
if (lastMinor.revision == 0) {
100-
if (stableVersions.get(stableVersions.size() - 1).size() == 1) {
101-
// a minor is being staged, which is also unreleased
102-
moveLastToUnreleased(stableVersions, unreleasedVersions);
103-
}
104-
// remove the next bugfix
105-
if (stableVersions.isEmpty() == false) {
106-
moveLastToUnreleased(stableVersions, unreleasedVersions);
98+
List<Version> lastMinorLine = stableVersions.get(stableVersions.size() - 1);
99+
if (lastMinorLine.get(lastMinorLine.size() - 1) instanceof LegacyESVersion == false) {
100+
// if the last minor line is Legacy there are no more staged releases; do nothing
101+
Version lastMinor = moveLastToUnreleased(stableVersions, unreleasedVersions);
102+
if (lastMinor instanceof LegacyESVersion == false && lastMinor.revision == 0) {
103+
// no more staged legacy versions
104+
if (stableVersions.get(stableVersions.size() - 1).size() == 1) {
105+
// a minor is being staged, which is also unreleased
106+
moveLastToUnreleased(stableVersions, unreleasedVersions);
107+
}
108+
// remove the next bugfix
109+
if (stableVersions.isEmpty() == false) {
110+
moveLastToUnreleased(stableVersions, unreleasedVersions);
111+
}
107112
}
108113
}
109114
}

0 commit comments

Comments
 (0)