Add staged version 1.1.1 (#1505)

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Nov 4, 2021 · d310108 · d310108
1 parent 984eb34
commit d310108
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -77,3 +77,4 @@ BWC_VERSION:
  - "1.0.0"
  - "1.0.1"
  - "1.1.0"
+ - "1.1.1"
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/BwcVersions.java b/buildSrc/src/main/java/org/opensearch/gradle/BwcVersions.java
@@ -174,7 +174,10 @@ public BwcVersions(SortedSet<Version> allVersions, Version currentVersionPropert
 
  private void assertNoOlderThanTwoMajors() {
  Set<Integer> majors = groupByMajor.keySet();
- if (majors.size() != 2 && currentVersion.getMinor() != 0 && currentVersion.getRevision() != 0) {
+ // until OpenSearch 3.0 we will need to carry three major support
+ // (1, 7, 6) && (2, 1, 7) since OpenSearch 1.0 === Legacy 7.x
+ int numSupportedMajors = (currentVersion.getMajor() < 3) ? 3 : 2;
+ if (majors.size() != numSupportedMajors && currentVersion.getMinor() != 0 && currentVersion.getRevision() != 0) {
  throw new IllegalStateException("Expected exactly 2 majors in parsed versions but found: " + majors);
  }
  }

diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -73,6 +73,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
  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_1 = new Version(1010199, org.apache.lucene.util.Version.LUCENE_8_9_0);
  public static final Version V_1_2_0 = new Version(1020099, org.apache.lucene.util.Version.LUCENE_8_10_1);
  public static final Version CURRENT = V_1_2_0;