Bump to version 1.2

Bump OpenSearch and OpenSearch Dashboards plugins to 1.2 Related issue: #167 Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
opensearch-project · Nov 4, 2021 · 022544c · 022544c
1 parent b4ec424
commit 022544c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -5,8 +5,8 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: reportsDashboards
   ARTIFACT_NAME: reports-dashboards
-  OPENSEARCH_VERSION: '1.1'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
+  OPENSEARCH_VERSION: '1.x'
+  OPENSEARCH_PLUGIN_VERSION: 1.2.0.0
 
 jobs:
   build:

diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -3,8 +3,8 @@ name: Test and Build Reports Scheduler
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
-  OPENSEARCH_BRANCH: '1.1'
+  OPENSEARCH_VERSION: '1.2.0-SNAPSHOT'
+  OPENSEARCH_BRANCH: '1.x'
   COMMON_UTILS_BRANCH: 'main'
   JOB_SCHEDULER_BRANCH: 'main'
 

diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "reportsDashboards",
-  "version": "1.1.0.0",
-  "opensearchDashboardsVersion": "1.1.0",
+  "version": "1.2.0.0",
+  "opensearchDashboardsVersion": "1.2.0",
   "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
   "optionalPlugins": ["share"],
   "server": true,

diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json
@@ -1,11 +1,11 @@
 {
   "name": "reports-dashboards",
-  "version": "1.1.0.0",
+  "version": "1.2.0.0",
   "description": "OpenSearch Dashboards Reports Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",
   "opensearchDashboards": {
-    "version": "1.1.0",
+    "version": "1.2.0",
     "templateVersion": "1.0.0"
   },
   "scripts": {

diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle
@@ -30,7 +30,7 @@ import java.util.concurrent.Callable
 buildscript {
     ext {
         opensearch_group = "org.opensearch"
-        opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT")
         // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
         opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
@@ -156,7 +156,7 @@ dependencies {
     testCompile "org.opensearch.test:framework:${opensearch_version}"
     testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-    testCompile "org.mockito:mockito-core:2.23.0"
+    testCompile "org.mockito:mockito-core:3.12.4"
     testCompile 'com.google.code.gson:gson:2.8.6'
 
     ktlint "com.pinterest:ktlint:0.33.0"

diff --git a/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.1.0.0-SNAPSHOT.zip b/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.1.0.0-SNAPSHOT.zip
diff --git a/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip b/...-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip