Bumping 2.x to 2.2.0 (opensearch-project#3672)

* Revert "Remove deprecated methods from JodaCompatibleZonedDateTime which are called by scripts (opensearch-project#3346) (opensearch-project#3347)" This reverts commit 3537b5a. Signed-off-by: Sarat Vemulapalli <[email protected]> * Bumping 2.x to 2.2 Signed-off-by: Sarat Vemulapalli <[email protected]> * Updating lucene verion for 2.1 Signed-off-by: Sarat Vemulapalli <[email protected]>
tlfeng · Jun 24, 2022 · 718ea66 · 718ea66
1 parent c355e12
commit 718ea66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -44,3 +44,4 @@ BWC_VERSION:
   - "2.0.0"
   - "2.0.1"
   - "2.0.2"
+  - "2.1.0"
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,4 +1,4 @@
-opensearch        = 2.1.0
+opensearch        = 2.2.0
 lucene            = 9.3.0-snapshot-b7231bb
 
 bundled_jdk_vendor = adoptium

diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -91,8 +91,9 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_2_0_1 = new Version(2000199, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_2_0_2 = new Version(2000299, org.apache.lucene.util.Version.LUCENE_9_1_0);
-    public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_3_0);
-    public static final Version CURRENT = V_2_1_0;
+    public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_2_0);
+    public static final Version V_2_2_0 = new Version(2020099, org.apache.lucene.util.Version.LUCENE_9_3_0);
+    public static final Version CURRENT = V_2_2_0;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,3 +44,4 @@ BWC_VERSION: @@
       - "2.0.0"
       - "2.0.1"
       - "2.0.2"
+      - "2.1.0"