From 8f598bcfd85eb10e3d926923c75ef086291d998d Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Mon, 31 Oct 2022 12:34:42 -0700 Subject: [PATCH] Bump version to 1.3.7 Signed-off-by: Peng Huo --- .github/workflows/sql-test-and-build-workflow.yml | 2 +- .github/workflows/sql-workbench-test-and-build-workflow.yml | 2 +- build.gradle | 2 +- doctest/build.gradle | 4 +++- workbench/opensearch_dashboards.json | 4 ++-- workbench/package.json | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index a9bf4998ed..f9341a3782 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -3,7 +3,7 @@ name: SQL Java CI on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.3.6-SNAPSHOT' + OPENSEARCH_VERSION: '1.3.7-SNAPSHOT' jobs: build: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index e18d2f8c36..850457fac0 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -5,7 +5,7 @@ on: [pull_request, push] env: PLUGIN_NAME: query-workbench-dashboards OPENSEARCH_VERSION: '1.3' - OPENSEARCH_PLUGIN_VERSION: 1.3.6.0 + OPENSEARCH_PLUGIN_VERSION: 1.3.7.0 jobs: diff --git a/build.gradle b/build.gradle index 9017c9f643..71785a0f72 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.6-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.7-SNAPSHOT") spring_version = "5.3.22" jackson_version = "2.13.4" jackson_databind_version = "2.13.4.2" diff --git a/doctest/build.gradle b/doctest/build.gradle index 2ec96f3401..092900bc65 100644 --- a/doctest/build.gradle +++ b/doctest/build.gradle @@ -45,7 +45,9 @@ task stopOpenSearch(type: KillProcessTask) doctest.dependsOn startOpenSearch doctest.finalizedBy stopOpenSearch -build.dependsOn doctest +// disable doctest for 1.3.x in case no opensearch-ml-1.3.7 snapshot. +// https://github.com/opensearch-project/sql/issues/942 +// build.dependsOn doctest clean.dependsOn(cleanBootstrap) String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.6/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-1.3.6.0.zip' diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json index 8fa4eb429d..03eacbdfad 100644 --- a/workbench/opensearch_dashboards.json +++ b/workbench/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "queryWorkbenchDashboards", - "version": "1.3.6.0", - "opensearchDashboardsVersion": "1.3.6", + "version": "1.3.7.0", + "opensearchDashboardsVersion": "1.3.7", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/workbench/package.json b/workbench/package.json index a69f2ef31c..ada0a1a518 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-query-workbench", - "version": "1.3.6.0", + "version": "1.3.7.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0",