diff --git a/.ci/bwcVersions b/.ci/bwcVersions index bba1c808db6..21b111c307b 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -74,3 +74,4 @@ BWC_VERSION: - "7.10.0" - "7.10.1" - "7.10.2" + - "1.0.0" diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 4d823d7d11f..d9ab87ba5ec 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,4 +1,4 @@ -opensearch = 1.0.0 +opensearch = 1.1.0 lucene = 8.8.2 bundled_jdk_vendor = adoptopenjdk diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java index b6edb1fe39a..c511f49ad2a 100644 --- a/server/src/main/java/org/opensearch/Version.java +++ b/server/src/main/java/org/opensearch/Version.java @@ -71,7 +71,8 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST); public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2); - public static final Version CURRENT = V_1_0_0; + public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_8_2); + public static final Version CURRENT = V_1_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/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java index 1cd1bc739b5..58ff2c94545 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java @@ -961,7 +961,7 @@ public abstract class OpenSearchRestTestCase extends OpenSearchTestCase { requestOptions.setWarningsHandler(warnings -> warnings.equals(esExpectedWarnings) == false); request.setOptions(requestOptions); } else if (nodeVersions.stream().anyMatch(version -> version.onOrAfter(LegacyESVersion.V_7_6_0) - && version.before(Version.V_1_0_0))) { + && version.before(Version.V_1_0_0))) { requestOptions.setWarningsHandler(warnings -> warnings.isEmpty() == false && warnings.equals(esExpectedWarnings) == false); request.setOptions(requestOptions); }