From 718ea66c2c3f28ad1d432ec4943dea3ae651efec Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Fri, 24 Jun 2022 08:58:33 -0700 Subject: [PATCH] Bumping 2.x to 2.2.0 (#3672) * Revert "Remove deprecated methods from JodaCompatibleZonedDateTime which are called by scripts (#3346) (#3347)" This reverts commit 3537b5abaffb0f28285daa87ca04bc2bc887e1df. Signed-off-by: Sarat Vemulapalli * Bumping 2.x to 2.2 Signed-off-by: Sarat Vemulapalli * Updating lucene verion for 2.1 Signed-off-by: Sarat Vemulapalli --- .ci/bwcVersions | 1 + buildSrc/version.properties | 2 +- server/src/main/java/org/opensearch/Version.java | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 29e99f8588693..f2d4aef40b4d9 100644 --- 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 index fafe1eab362fc..478f114fa265a 100644 --- 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 index c0821efdd6713..4867708a2d958 100644 --- 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, 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());