From 08e0390dcda750d36b1ab6c7bb4d1e36a6986da3 Mon Sep 17 00:00:00 2001 From: Eric Wei Date: Wed, 7 Sep 2022 15:06:21 -0700 Subject: [PATCH] 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 * Update snapshots Signed-off-by: Joshua Li Co-authored-by: Joshua Li * Release Notes for 2.2.0 (#920) (#922) Signed-off-by: vamsi-amazon (cherry picked from commit 77c460f90509d5c1bf36a3828b16e2a4958baeb3) Co-authored-by: vamsi-amazon * Staging for version increment automation (#848) (#939) * Version increment automation Signed-off-by: pgodithi * Version increment automation Signed-off-by: pgodithi * Version increment automation: task rename updateVersion Signed-off-by: pgodithi (cherry picked from commit b5c680278f35c2c3a570aa98a563603d59291f65) Signed-off-by: prudhvigodithi Signed-off-by: pgodithi Signed-off-by: prudhvigodithi Co-authored-by: Prudhvi Godithi * Increment version to 2.3.0-SNAPSHOT (#979) Signed-off-by: opensearch-ci-bot Signed-off-by: opensearch-ci-bot Co-authored-by: opensearch-ci-bot Signed-off-by: pgodithi Signed-off-by: prudhvigodithi Signed-off-by: opensearch-ci-bot Signed-off-by: Eric Wei Co-authored-by: vamsi-amazon Co-authored-by: Joshua Li Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Prudhvi Godithi Co-authored-by: opensearch-ci-bot --- .../dashboards-observability-test-and-build-workflow.yml | 2 +- dashboards-observability/opensearch_dashboards.json | 4 ++-- dashboards-observability/package.json | 2 +- opensearch-observability/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml index 461c1d2db..84f24ff11 100644 --- 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 index 3a418efc4..f623633a5 100644 --- 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 index 380e208e3..5f45bc5bf 100644 --- 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 index 259071e0c..51392e0b4 100644 --- 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'