Updates dashbquery-workbench-dashboardsoards version to 1.2. Changes …

…the package jsons, as well as the github action workflows. Signed-off-by: Tengda He <tengh@amazon.com>
opensearch-project · Nov 2, 2021 · 927ccb1 · 927ccb1
1 parent 6dae7b2
commit 927ccb1
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
@@ -16,6 +16,6 @@ jobs:
         with:
           config-name: draft-release-notes-config.yml
           tag: (None)
-          version: 1.1.0.1
+          version: 1.2.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml
@@ -12,7 +12,7 @@ env:
   ODBC_BUILD_PATH: "./build/odbc/build"
   AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
   PLUGIN_NAME: opensearch-sql-odbc
-  OD_VERSION: 1.1.0.1
+  OD_VERSION: 1.2.0.0
 
 jobs:
   build-mac:

diff --git a/.github/workflows/sql-odbc-rename-and-release-workflow.yml b/.github/workflows/sql-odbc-rename-and-release-workflow.yml
@@ -8,7 +8,7 @@ on:
       - rename*
 
 env:
-  OD_VERSION: 1.1.0.1
+  OD_VERSION: 1.2.0.0
 
 jobs:
   upload-odbc:

diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml
@@ -8,7 +8,7 @@ on:
 env: 
   PLUGIN_NAME: query-workbench-dashboards
   OPENSEARCH_VERSION: '1.x'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.1
+  OPENSEARCH_PLUGIN_VERSION: 1.2.0.0
 
 jobs:
 

diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml
@@ -5,7 +5,7 @@ on: [pull_request, push]
 env: 
   PLUGIN_NAME: query-workbench-dashboards
   OPENSEARCH_VERSION: '1.x'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
+  OPENSEARCH_PLUGIN_VERSION: 1.2.0.0
 
 jobs:
 

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT")
     }
 
     repositories {
@@ -61,7 +61,7 @@ ext {
 }
 
 allprojects {
-    version = opensearch_version - "-SNAPSHOT" + ".1"
+    version = opensearch_version - "-SNAPSHOT" + ".0"
     if (isSnapshot) {
         version += "-SNAPSHOT"
     }

diff --git a/sql-cli/src/opensearch_sql_cli/__init__.py b/sql-cli/src/opensearch_sql_cli/__init__.py
@@ -22,4 +22,4 @@
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 """
-__version__ = "1.1.0.1"
+__version__ = "1.2.0.0"
diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
@@ -87,8 +87,8 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer")
 set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller")
 
 # ODBC Driver version 
-set(DRIVER_PACKAGE_VERSION "1.1.0.1")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,1,0,1")
+set(DRIVER_PACKAGE_VERSION "1.2.0.0")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,2,0,0")
 add_compile_definitions( OPENSEARCH_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
                          # Comma separated version is required for odbc administrator's driver file.
                          OPENSEARCH_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )

diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='opensearch_sql_odbc' superclass='odbc' plugin-version='1.1.0.1' name='SQL' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='opensearch_sql_odbc' superclass='odbc' plugin-version='1.2.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
   <vendor-information>
       <company name="OpenSearch for ES"/>
       <support-link url="https://github.com/opensearch-project/sql"/>

diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml b/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='opensearch_sql_odbc_dev' superclass='odbc' plugin-version='1.1.0.1' name='OpenSearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='opensearch_sql_odbc_dev' superclass='odbc' plugin-version='1.2.0.0' name='OpenSearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
   <vendor-information>
       <company name="OpenSearch"/>
       <support-link url="https://github.com/opensearch-project/sql"/>

diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "queryWorkbenchDashboards",
-  "version": "1.1.0.0",
-  "opensearchDashboardsVersion": "1.1.0",
+  "version": "1.2.0.0",
+  "opensearchDashboardsVersion": "1.2.0",
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation"],

diff --git a/workbench/package.json b/workbench/package.json
@@ -1,12 +1,12 @@
 {
   "name": "opensearch-query-workbench",
-  "version": "1.1.0.1",
+  "version": "1.2.0.0",
   "description": "Query Workbench",
   "main": "index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/sql/tree/main/workbench",
   "opensearchDashboards": {
-    "version": "1.1.0",
+    "version": "1.2.0",
     "templateVersion": "1.0.0"
   },
   "repository": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - rename*
     env:
-      OD_VERSION: 1.1.0.1
+      OD_VERSION: 1.2.0.0
     jobs:
       upload-odbc:
@@ Expand Down @@