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 2.x branch to 2.2.0 #493

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Bump 2.x branch to 2.2.0 #493

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-notifications-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: [pull_request, push]
env:
PLUGIN_NAME: notifications-dashboards
OPENSEARCH_DASHBOARDS_VERSION: '2.x'
OPENSEARCH_VERSION: '2.1.0-SNAPSHOT'
OPENSEARCH_VERSION: '2.2.0-SNAPSHOT'

jobs:
tests:
Expand Down
4 changes: 2 additions & 2 deletions dashboards-notifications/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "notificationsDashboards",
"version": "2.1.0.0",
"opensearchDashboardsVersion": "2.1.0",
"version": "2.2.0.0",
"opensearchDashboardsVersion": "2.2.0",
"requiredPlugins": ["navigation", "data"],
"optionalPlugins": ["share"],
"server": true,
Expand Down
2 changes: 1 addition & 1 deletion dashboards-notifications/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notifications-dashboards",
"version": "2.1.0.0",
"version": "2.2.0.0",
"description": "OpenSearch Dashboards Notifications Plugin",
"license": "Apache-2.0",
"main": "index.ts",
Expand Down
4 changes: 2 additions & 2 deletions notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
// 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
// 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
plugin_no_snapshot = opensearch_build
Expand Down
2 changes: 1 addition & 1 deletion notifications/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ dependencies {
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.6.2')
testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "net.bytebuddy:byte-buddy-agent:1.12.7"
testImplementation "org.mockito:mockito-core:4.3.1"
testImplementation "org.mockito:mockito-core:4.6.1"
testImplementation "org.opensearch.test:framework:${opensearch_version}"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" // required by mockk
implementation project(path: ":${rootProject.name}-core-spi", configuration: 'shadow')
Expand Down
2 changes: 1 addition & 1 deletion notifications/notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dependencies {
testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}" // required by mockk
testImplementation "net.bytebuddy:byte-buddy-agent:1.12.7"
testImplementation "org.mockito:mockito-core:4.3.1"
testImplementation "org.mockito:mockito-core:4.6.1"
testImplementation 'com.google.code.gson:gson:2.8.7'
testImplementation 'org.springframework.integration:spring-integration-mail:5.5.0'
testImplementation 'org.springframework.integration:spring-integration-test-support:5.5.0'
Expand Down