diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index 04734859..18f51298 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -9,7 +9,7 @@ env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards OPENSEARCH_VERSION: '1.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: build: diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 30d6b8bf..36b9912a 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.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.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 1785064c..2312d90b 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -22,7 +22,7 @@ jobs: ref: '1.0' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false # dependencies: common-utils - name: Checkout common-utils @@ -33,7 +33,7 @@ jobs: path: common-utils - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 # dependencies: job-scheduler - name: Checkout job-scheduler @@ -44,7 +44,7 @@ jobs: path: job-scheduler - name: Build job-scheduler working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 -Dbuild.snapshot=false # reports-scheduler - name: Checkout Reports Scheduler @@ -53,7 +53,7 @@ jobs: - name: Build with Gradle run: | cd reports-scheduler - ./gradlew build -Dopensearch.version=1.0.0-rc1 + ./gradlew build -Dopensearch.version=1.0.0 - name: Upload coverage uses: codecov/codecov-action@v1 @@ -72,3 +72,4 @@ jobs: with: name: reports-scheduler path: reports-scheduler-builds + \ No newline at end of file diff --git a/dashboards-reports/common/index.ts b/dashboards-reports/common/index.ts index a7da183f..45bded11 100644 --- a/dashboards-reports/common/index.ts +++ b/dashboards-reports/common/index.ts @@ -24,8 +24,8 @@ * permissions and limitations under the License. */ -export const PLUGIN_ID = 'reportsDashboards'; -export const PLUGIN_NAME = 'reports-dashboards'; +export const PLUGIN_NAME = 'Reporting'; +export const PLUGIN_ID = 'reports-dashboards'; export const API_PREFIX = '/api/reporting'; diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json index cbca8ab3..8e3da82b 100644 --- a/dashboards-reports/opensearch_dashboards.json +++ b/dashboards-reports/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "reportsDashboards", - "version": "1.0.0.0-rc1", - "opensearchDashboardsVersion": "1.0.0-rc1", + "version": "1.0.0.0", + "opensearchDashboardsVersion": "1.0.0", "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"], "optionalPlugins": ["share"], "server": true, diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index 391272fa..8feb3f0d 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -1,12 +1,12 @@ { - "name": "reports_dashboards", - "version": "1.0.0.0-rc1", + "name": "reports-dashboards", + "version": "1.0.0.0", "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", "opensearchDashboards": { - "version": "1.0.0-rc1", - "templateVersion": "1.0.0-rc1" + "version": "1.0.0", + "templateVersion": "1.0.0" }, "scripts": { "osd": "node ../../scripts/osd", diff --git a/dashboards-reports/public/plugin.ts b/dashboards-reports/public/plugin.ts index a9686b8f..98d8bd71 100644 --- a/dashboards-reports/public/plugin.ts +++ b/dashboards-reports/public/plugin.ts @@ -37,17 +37,17 @@ import { } from './types'; import { i18n } from '@osd/i18n'; import './components/context_menu/context_menu'; -import { PLUGIN_NAME } from '../common'; +import { PLUGIN_ID, PLUGIN_NAME } from '../common'; export class ReportsDashboardsPlugin - implements - Plugin { + implements Plugin +{ public setup(core: CoreSetup): ReportsDashboardsPluginSetup { // Register an application into the side navigation menu core.application.register({ - id: PLUGIN_NAME, + id: PLUGIN_ID, title: i18n.translate('opensearch.reports.pluginName', { - defaultMessage: 'Reporting', + defaultMessage: PLUGIN_NAME, }), category: { id: 'opensearch', diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index ede0b602..b4d6f79f 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.0.0-rc1") + opensearch_version = System.getProperty("opensearch.version", "1.0.0") kotlin_version = System.getProperty("kotlin.version", "1.4.0") } @@ -107,7 +107,7 @@ ext { licenseFile = rootProject.file('LICENSE.txt') noticeFile = rootProject.file('NOTICE.txt') isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearchVersion = "${version}.0-rc1" + opensearchVersion = "${version}.0" } if (isSnapshot) {