From 336e0579273d32e668d3c85475e4e2764e0e2117 Mon Sep 17 00:00:00 2001
From: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Date: Fri, 29 Jul 2022 10:32:28 -0700
Subject: [PATCH] Bump 2.x branch to 2.2.0

Signed-off-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
---
 .../dashboards-notifications-test-and-build-workflow.yml      | 2 +-
 dashboards-notifications/opensearch_dashboards.json           | 4 ++--
 dashboards-notifications/package.json                         | 2 +-
 notifications/build.gradle                                    | 4 ++--
 notifications/core/build.gradle                               | 2 +-
 notifications/notifications/build.gradle                      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml
index 2b4f3e82..f4ffb0b4 100644
--- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml
+++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml
@@ -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:
diff --git a/dashboards-notifications/opensearch_dashboards.json b/dashboards-notifications/opensearch_dashboards.json
index 41c3d100..6db8729b 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.2.0.0",
+  "opensearchDashboardsVersion": "2.2.0",
   "requiredPlugins": ["navigation", "data"],
   "optionalPlugins": ["share"],
   "server": true,
diff --git a/dashboards-notifications/package.json b/dashboards-notifications/package.json
index 22c11c70..d79a7055 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.2.0.0",
   "description": "OpenSearch Dashboards Notifications Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",
diff --git a/notifications/build.gradle b/notifications/build.gradle
index f5da71b3..b721bbc0 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.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
diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle
index b9027312..56a4008c 100644
--- a/notifications/core/build.gradle
+++ b/notifications/core/build.gradle
@@ -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')
diff --git a/notifications/notifications/build.gradle b/notifications/notifications/build.gradle
index 9901115e..0ec7fc9f 100644
--- a/notifications/notifications/build.gradle
+++ b/notifications/notifications/build.gradle
@@ -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'