Bump to 2.3.0 (opensearch-project#513)

* Bump to 2.3.0 Signed-off-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com> * Make removal of the existing plugins in the security GitHub Action conditional on its existence in the Docker image Signed-off-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com> * Bump mockito-core to 4.7.0 Signed-off-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com> Signed-off-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
prudhvigodithi · Aug 29, 2022 · d56a79b · d56a79b
1 parent 3e72775
commit d56a79b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git 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.3.0-SNAPSHOT'
 
 jobs:
   tests:

diff --git a/.github/workflows/security-notifications-test-workflow.yml b/.github/workflows/security-notifications-test-workflow.yml
@@ -55,8 +55,9 @@ jobs:
           if docker pull opensearchstaging/opensearch:$docker_version
           then
             echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile
-            echo "RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications;" >> Dockerfile
-            echo "RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications-core;" >> Dockerfile
+            # Making the removal of the existing plugins in the docker image conditional in case this workflow is running before the new version of the plugins are published to the Docker image
+            echo "RUN if /usr/share/opensearch/bin/opensearch-plugin list | grep -q 'opensearch-notifications$'; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications; fi" >> Dockerfile
+            echo "RUN if /usr/share/opensearch/bin/opensearch-plugin list | grep -q 'opensearch-notifications-core$'; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-notifications-core; fi" >> Dockerfile
             echo "ADD notifications/core/build/distributions/$plugin_core /tmp/" >> Dockerfile
             echo "RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:/tmp/$plugin_core" >> Dockerfile
             echo "ADD notifications/notifications/build/distributions/$plugin /tmp/" >> Dockerfile

diff --git 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.3.0.0",
+  "opensearchDashboardsVersion": "2.3.0",
   "requiredPlugins": ["navigation", "data"],
   "optionalPlugins": ["share"],
   "server": true,

diff --git a/dashboards-notifications/package.json b/dashboards-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notifications-dashboards",
-  "version": "2.1.0.0",
+  "version": "2.3.0.0",
   "description": "OpenSearch Dashboards Notifications Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",

diff --git a/notifications/build.gradle b/notifications/build.gradle
@@ -6,7 +6,7 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.3.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT

diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle
@@ -43,6 +43,7 @@ publishing {
     publications {
         pluginZip(MavenPublication) { publication ->
             pom {
+                groupId = 'org.opensearch.plugin'
                 name = "opensearch-notifications-core"
                 description = "OpenSearch Notifications Core Plugin"
                 licenses {
@@ -154,7 +155,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.7.0"
     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
@@ -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.7.0"
     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'