Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to version 1.0.0.0 #103

Merged
merged 1 commit into from
Jun 29, 2021
Merged

Bump to version 1.0.0.0 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dashboards-reports-release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboards-reports-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/reports-scheduler-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -72,3 +72,4 @@ jobs:
with:
name: reports-scheduler
path: reports-scheduler-builds

4 changes: 2 additions & 2 deletions dashboards-reports/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions dashboards-reports/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 4 additions & 4 deletions dashboards-reports/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "reports_dashboards",
"version": "1.0.0.0-rc1",
"name": "reports-dashboards",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does changing the name here affect anything? i couldn't remember

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it shouldn't. I just changed it for format consistency. We no longer uses underscore for naming anywhere I think

"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",
Expand Down
10 changes: 5 additions & 5 deletions dashboards-reports/public/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReportsDashboardsPluginSetup, ReportsDashboardsPluginStart> {
implements Plugin<ReportsDashboardsPluginSetup, ReportsDashboardsPluginStart>
{
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',
Expand Down
4 changes: 2 additions & 2 deletions reports-scheduler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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) {
Expand Down