From f25f0aafad8d517d423315961ab82d77760c6f20 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Thu, 4 Nov 2021 13:22:34 -0700 Subject: [PATCH] Bump to version 1.2 (#203) * 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 * Use maven for building reports scheduler Signed-off-by: Joshua Li Co-authored-by: Joshua Li --- ...boards-reports-test-and-build-workflow.yml | 4 +- ...orts-scheduler-test-and-build-workflow.yml | 38 +------------------ opensearch_dashboards.json | 4 +- package.json | 4 +- 4 files changed, 7 insertions(+), 43 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 6dac8119..475f2e04 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -5,8 +5,8 @@ on: [pull_request, push] env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards - OPENSEARCH_VERSION: '1.1' - OPENSEARCH_PLUGIN_VERSION: 1.1.0.0 + OPENSEARCH_VERSION: '1.2' + 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..d7ec7744 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -3,10 +3,7 @@ name: Test and Build Reports Scheduler on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.1.0-SNAPSHOT' - OPENSEARCH_BRANCH: '1.1' - COMMON_UTILS_BRANCH: 'main' - JOB_SCHEDULER_BRANCH: 'main' + OPENSEARCH_VERSION: '1.2.0-SNAPSHOT' jobs: build: @@ -18,39 +15,6 @@ jobs: with: java-version: 1.14 - # dependencies: OpenSearch - - name: Checkout OpenSearch - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/OpenSearch' - path: OpenSearch - ref: ${{ env.OPENSEARCH_BRANCH }} - - name: Build OpenSearch - working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal - - # dependencies: common-utils - - name: Checkout common-utils - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/common-utils' - path: common-utils - ref: ${{ env.COMMON_UTILS_BRANCH }} - - name: Build common-utils - working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} - - # dependencies: job-scheduler - - name: Checkout job-scheduler - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/job-scheduler' - ref: ${{ env.JOB_SCHEDULER_BRANCH }} - path: job-scheduler - - name: Build job-scheduler - working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} - # reports-scheduler - name: Checkout Reports Scheduler uses: actions/checkout@v2 diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index b746bd64..d1034d2a 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "reportsDashboards", - "version": "1.1.0.0", - "opensearchDashboardsVersion": "1.1.0", + "version": "1.2.0.0", + "opensearchDashboardsVersion": "1.2.0", "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"], "optionalPlugins": ["share"], "server": true, diff --git a/package.json b/package.json index 4b535490..a98991da 100644 --- a/package.json +++ b/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": {