version upgrade to 2.1.0 (#389)

* version upgrade to 2.1.0 Signed-off-by: Rupanshi Sharma <[email protected]> * Renames master/Master to clusterManager/ClusterManager as mentioned here: opensearch-project/OpenSearch#3542 Signed-off-by: Rupanshi Sharma <[email protected]> * Change XContentType.fromMediaTypeOrFormat to XContentType.fromMediaType in a test class to fix the unresolved method name error Signed-off-by: Rupanshi Sharma <[email protected]> * Upgrade gradle jar Signed-off-by: Rupanshi Sharma <[email protected]> * Revert "Renames master/Master to clusterManager/ClusterManager as mentioned here: opensearch-project/OpenSearch#3542" This reverts commit 01dd024. Signed-off-by: Rupanshi Sharma <[email protected]> Co-authored-by: Rupanshi Sharma <[email protected]>
opensearch-project · Jun 24, 2022 · 824105d · 824105d
1 parent ef0e360
commit 824105d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ import java.util.function.Predicate
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.0.0-SNAPSHOT -> 2.0.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/test/kotlin/org/opensearch/indexmanagement/ODFERestTestCase.kt b/src/test/kotlin/org/opensearch/indexmanagement/ODFERestTestCase.kt
@@ -77,7 +77,7 @@ abstract class ODFERestTestCase : OpenSearchRestTestCase() {
         waitFor {
             val response = client().performRequest(Request("GET", "/_cat/thread_pool?format=json"))
 
-            val xContentType = XContentType.fromMediaTypeOrFormat(response.entity.contentType.value)
+            val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
             xContentType.xContent().createParser(
                 NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
                 response.entity.content
@@ -108,7 +108,7 @@ abstract class ODFERestTestCase : OpenSearchRestTestCase() {
         // Delete all indices
         val response = client().performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
 
-        val xContentType = XContentType.fromMediaTypeOrFormat(response.entity.contentType.value)
+        val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
         xContentType.xContent().createParser(
             NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
             response.entity.content