Backport 2.x to 2.3 with conflict resolving changes (#997)

* Bump to 2.2.0 (#918) * Bump to 2.2.0 Signed-off-by: vamsi-amazon <[email protected]> * Update snapshots Signed-off-by: Joshua Li <[email protected]> Co-authored-by: Joshua Li <[email protected]> * Release Notes for 2.2.0 (#920) (#922) Signed-off-by: vamsi-amazon <[email protected]> (cherry picked from commit 77c460f) Co-authored-by: vamsi-amazon <[email protected]> * Staging for version increment automation (#848) (#939) * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation: task rename updateVersion Signed-off-by: pgodithi <[email protected]> (cherry picked from commit b5c6802) Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: pgodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> Co-authored-by: Prudhvi Godithi <[email protected]> * Increment version to 2.3.0-SNAPSHOT (#979) Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Signed-off-by: pgodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Eric Wei <[email protected]> Co-authored-by: vamsi-amazon <[email protected]> Co-authored-by: Joshua Li <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Prudhvi Godithi <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]>
opensearch-project · Sep 7, 2022 · 08e0390 · 08e0390
1 parent 0c031d4
commit 08e0390
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -6,7 +6,7 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: dashboards-observability
   OPENSEARCH_VERSION: 'main'
-  OPENSEARCH_PLUGIN_VERSION: 2.2.1.0
+  OPENSEARCH_PLUGIN_VERSION: 2.3.0.0
 
 jobs:
 

diff --git a/dashboards-observability/opensearch_dashboards.json b/dashboards-observability/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "observabilityDashboards",
-  "version": "2.2.1.0",
-  "opensearchDashboardsVersion": "2.2.1",
+  "version": "2.3.0.0",
+  "opensearchDashboardsVersion": "2.3.0",
   "server": true,
   "ui": true,
   "requiredPlugins": [

diff --git a/dashboards-observability/package.json b/dashboards-observability/package.json
@@ -1,6 +1,6 @@
 {
   "name": "observability-dashboards",
-  "version": "2.2.1.0",
+  "version": "2.3.0.0",
   "main": "index.ts",
   "license": "Apache-2.0",
   "scripts": {

diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle
@@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.2.1-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.3.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'