Bump version to 1.1.0.1 for patch release (#253)

* Bump version to 1.1.0.1 for patch release Signed-off-by: chloe-zh <[email protected]> * Removed redundant line Signed-off-by: chloe-zh <[email protected]>
opensearch-project · Oct 28, 2021 · c88f643 · c88f643
1 parent 7108d35
commit c88f643
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 13 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.0
+          version: 1.1.0.1
         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.0
+  OD_VERSION: 1.1.0.1
 
 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.0
+  OD_VERSION: 1.1.0.1
 
 jobs:
   upload-odbc:

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

diff --git a/build.gradle b/build.gradle
@@ -61,7 +61,7 @@ ext {
 }
 
 allprojects {
-    version = opensearch_version - "-SNAPSHOT" + ".0"
+    version = opensearch_version - "-SNAPSHOT" + ".1"
     if (isSnapshot) {
         version += "-SNAPSHOT"
     }

diff --git a/release-notes/opensearch-sql.release-notes-1.1.0.1.md b/release-notes/opensearch-sql.release-notes-1.1.0.1.md
@@ -0,0 +1,21 @@
+## 2021-10-28 Version 1.1.0.1
+
+Compatible with OpenSearch and OpenSearch Dashboards Version 1.1.0
+
+### Enhancements
+* Support match function as filter in SQL and PPL ([204](https://github.com/opensearch-project/sql/pull/240))
+* Renamed plugin helper config file to consistent name with OSD ([#228](https://github.com/opensearch-project/sql/pull/228))
+* Support ODBC compatibility with ODFE SQL ([#238](https://github.com/opensearch-project/sql/pull/238))
+* Support span aggregation in query engine ([#220](https://github.com/opensearch-project/sql/pull/220))
+
+### Bug Fixes
+* Fix PPL request concurrency handling issue ([#207](https://github.com/opensearch-project/sql/pull/207))
+* Changed the ODBC mac installer build platform to MacOS 10.15 from latest ([#230](https://github.com/opensearch-project/sql/pull/230))
+
+### Infrastructure
+* Removed integtest.sh. ([#208](https://github.com/opensearch-project/sql/pull/208))
+* Update build to use public Maven repo ([#225](https://github.com/opensearch-project/sql/pull/225))
+* Address security vulnerability CVE-2021-3795 ([#231](https://github.com/opensearch-project/sql/pull/231))
+* Addressed security vulnerability CVE-2021-3807 ([#233](https://github.com/opensearch-project/sql/pull/233))
+* Enable DCO Workflow Check ([#242](https://github.com/opensearch-project/sql/pull/242))
+
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.0"
+__version__ = "1.1.0.1"
diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle
@@ -43,7 +43,7 @@ plugins {
 group 'org.opensearch.client'
 
 // keep version in sync with version in Driver source
-version '1.1.0.0'
+version '1.1.0.1'
 
 boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
 if (snapshot) {

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.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,1,0,0")
+set(DRIVER_PACKAGE_VERSION "1.1.0.1")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,1,0,1")
 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.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='opensearch_sql_odbc' superclass='odbc' plugin-version='1.1.0.1' 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.0' 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.1.0.1' 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/package.json b/workbench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensearch-query-workbench",
-  "version": "1.1.0.0",
+  "version": "1.1.0.1",
   "description": "Query Workbench",
   "main": "index.js",
   "license": "Apache-2.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - rename*
     env:
-      OD_VERSION: 1.1.0.0
+      OD_VERSION: 1.1.0.1
     jobs:
       upload-odbc:
@@ Expand Down @@