[Main] Bump Version 2.0 to 2.1 (#2715)

Bumps from version 2.0 to 2.1 Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Apr 2, 2022 · 6c195ab · 6c195ab
1 parent 78465b4
commit 6c195ab
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -39,4 +39,4 @@ BWC_VERSION:
   - "1.3.0"
   - "1.3.1"
   - "1.3.2"
-  - "1.4.0"
+  - "2.0.0"
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,4 +1,4 @@
-opensearch        = 2.0.0
+opensearch        = 2.1.0
 lucene            = 9.1.0
 
 bundled_jdk_vendor = adoptium

diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -81,9 +81,9 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_1_3_0 = new Version(1030099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_1_3_1 = new Version(1030199, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_1_3_2 = new Version(1030299, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_4_0 = new Version(1040099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
-    public static final Version CURRENT = V_2_0_0;
+    public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_1_0);
+    public static final Version CURRENT = V_2_1_0;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());

diff --git a/test/framework/src/main/java/org/opensearch/test/VersionUtils.java b/test/framework/src/main/java/org/opensearch/test/VersionUtils.java
@@ -89,7 +89,7 @@ static Tuple<List<Version>, List<Version>> resolveReleasedVersions(Version curre
             stableVersions = previousMajor;
             // remove current
             moveLastToUnreleased(currentMajor, unreleasedVersions);
-        } else if (current.major != 1 && current.major != 2) {
+        } else if (current.major != 1) {
             // on a stable or release branch, ie N.x
             stableVersions = currentMajor;
             // remove the next maintenance bugfix

diff --git a/test/framework/src/test/java/org/opensearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/opensearch/test/VersionUtilsTests.java
@@ -284,15 +284,17 @@ public void testResolveReleasedVersionsAtNewMinorBranchIn2x() {
                 Arrays.asList(
                     TestNewMinorBranchIn6x.V_1_6_0,
                     TestNewMinorBranchIn6x.V_1_6_1,
-                    TestNewMinorBranchIn6x.V_1_6_2,
                     TestNewMinorBranchIn6x.V_2_0_0,
                     TestNewMinorBranchIn6x.V_2_0_1,
                     TestNewMinorBranchIn6x.V_2_1_0,
                     TestNewMinorBranchIn6x.V_2_1_1
                 )
             )
         );
-        assertThat(unreleased, equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_2_1_2, TestNewMinorBranchIn6x.V_2_2_0)));
+        assertThat(
+            unreleased,
+            equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_1_6_2, TestNewMinorBranchIn6x.V_2_1_2, TestNewMinorBranchIn6x.V_2_2_0))
+        );
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,4 @@ BWC_VERSION: @@
       - "1.3.0"
       - "1.3.1"
       - "1.3.2"
-      - "1.4.0"
+      - "2.0.0"