Bumped version to 2.1.0, and gradle to 7.4.2. (opensearch-project#475)

* Bumped version to 2.1.0, and gradle to 7.4.2. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: Angie Zhang <[email protected]>
Angie-Zhang · Jun 29, 2022 · 4751831 · 4751831
1 parent 97fe933
commit 4751831
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -257,7 +257,7 @@ String bwcRemoteFile = 'https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elastics
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["7.10.2","2.0.1-SNAPSHOT"]
+            versions = ["7.10.2","2.1.0-SNAPSHOT"]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>(){
                 @Override

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/ODFERestTestCase.kt b/alerting/src/test/kotlin/org/opensearch/alerting/ODFERestTestCase.kt
@@ -81,7 +81,7 @@ abstract class ODFERestTestCase : OpenSearchRestTestCase() {
 
         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

diff --git a/build.gradle b/build.gradle
@@ -7,10 +7,10 @@ buildscript {
     apply from: 'build-tools/repositories.gradle'
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.0.1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        // 2.0.1-SNAPSHOT -> 2.0.1.0-SNAPSHOT
+        // 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         plugin_no_snapshot = opensearch_build

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