diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml index 2cd22997..aa2d9f74 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml @@ -9,8 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - OPENSEARCH_PLUGIN_VERSION: 2.1.0.0 + OPENSEARCH_DASHBOARDS_VERSION: 2.1 + OPENSEARCH_PLUGIN_VERSION: 2.1.1.0 jobs: diff --git a/dashboards-notifications/opensearch_dashboards.json b/dashboards-notifications/opensearch_dashboards.json index 41c3d100..fbe3b33f 100644 --- a/dashboards-notifications/opensearch_dashboards.json +++ b/dashboards-notifications/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "notificationsDashboards", - "version": "2.1.0.0", - "opensearchDashboardsVersion": "2.1.0", + "version": "2.1.1.0", + "opensearchDashboardsVersion": "2.1.1", "requiredPlugins": ["navigation", "data"], "optionalPlugins": ["share"], "server": true, diff --git a/dashboards-notifications/package.json b/dashboards-notifications/package.json index 22c11c70..8a21a39b 100644 --- a/dashboards-notifications/package.json +++ b/dashboards-notifications/package.json @@ -1,6 +1,6 @@ { "name": "notifications-dashboards", - "version": "2.1.0.0", + "version": "2.1.1.0", "description": "OpenSearch Dashboards Notifications Plugin", "license": "Apache-2.0", "main": "index.ts", diff --git a/notifications/build.gradle b/notifications/build.gradle index ecadf430..065b20d5 100644 --- a/notifications/build.gradle +++ b/notifications/build.gradle @@ -6,10 +6,10 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.1.1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") - // 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT + // 2.1.1-SNAPSHOT -> 2.1.1.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' if (buildVersionQualifier) { diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle index d52fb60c..b4e9b417 100644 --- a/notifications/core/build.gradle +++ b/notifications/core/build.gradle @@ -130,7 +130,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') diff --git a/notifications/notifications/build.gradle b/notifications/notifications/build.gradle index 2e7a1f5a..c23494e7 100644 --- a/notifications/notifications/build.gradle +++ b/notifications/notifications/build.gradle @@ -90,7 +90,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'