From 4251bdcdd7ddedd4ce200799e02f5f0e05bb56b3 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Fri, 29 Oct 2021 03:04:17 +0000 Subject: [PATCH] Bump to version 1.2 Bump OpenSearch and OpenSearch Dashboards plugins to 1.2 Related issue: https://github.com/opensearch-project/dashboards-reports/issues/167 Signed-off-by: Kawika Avilla --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- .../workflows/reports-scheduler-test-and-build-workflow.yml | 4 ++-- dashboards-reports/opensearch_dashboards.json | 2 +- dashboards-reports/package.json | 4 ++-- reports-scheduler/build.gradle | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index ede2e62c..06c2c01d 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -6,7 +6,7 @@ env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards OPENSEARCH_VERSION: '1.x' - OPENSEARCH_PLUGIN_VERSION: 1.1.0.0 + OPENSEARCH_PLUGIN_VERSION: 1.2.0.0 jobs: build: diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index a018e46f..cb3ecd12 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -3,8 +3,8 @@ name: Test and Build Reports Scheduler on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.1.0-SNAPSHOT' - OPENSEARCH_BRANCH: '1.1' + OPENSEARCH_VERSION: '1.2.0-SNAPSHOT' + OPENSEARCH_BRANCH: '1.x' COMMON_UTILS_BRANCH: 'main' JOB_SCHEDULER_BRANCH: 'main' diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json index b746bd64..53e51f48 100644 --- a/dashboards-reports/opensearch_dashboards.json +++ b/dashboards-reports/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "reportsDashboards", "version": "1.1.0.0", - "opensearchDashboardsVersion": "1.1.0", + "opensearchDashboardsVersion": "1.2.0", "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"], "optionalPlugins": ["share"], "server": true, diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index 4b535490..a98991da 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -1,11 +1,11 @@ { "name": "reports-dashboards", - "version": "1.1.0.0", + "version": "1.2.0.0", "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", "opensearchDashboards": { - "version": "1.1.0", + "version": "1.2.0", "templateVersion": "1.0.0" }, "scripts": { diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index abc4c9d4..501cf219 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -30,7 +30,7 @@ import java.util.concurrent.Callable buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build) @@ -156,7 +156,7 @@ dependencies { testCompile "org.opensearch.test:framework:${opensearch_version}" testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - testCompile "org.mockito:mockito-core:2.23.0" + testCompile "org.mockito:mockito-core:3.12.4" testCompile 'com.google.code.gson:gson:2.8.6' ktlint "com.pinterest:ktlint:0.33.0"