From 998fe0ba260dee8bccbdfd5e102fe6c150040247 Mon Sep 17 00:00:00 2001 From: David Cui Date: Thu, 2 Sep 2021 15:28:04 -0700 Subject: [PATCH 1/4] bump workbench versions to 1.1 Signed-off-by: David Cui --- workbench/opensearch_dashboards.json | 4 ++-- workbench/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json index 0ee32f9b98..c1b6ab2677 100644 --- a/workbench/opensearch_dashboards.json +++ b/workbench/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "queryWorkbenchDashboards", - "version": "1.0.0.0", - "opensearchDashboardsVersion": "1.0.0", + "version": "1.1.0.0", + "opensearchDashboardsVersion": "1.1.0", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/workbench/package.json b/workbench/package.json index 3e78f6a26b..3d9af584a9 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,12 +1,12 @@ { "name": "opensearch-query-workbench", - "version": "1.0.0.0", + "version": "1.1.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.0.0", + "version": "1.1.0", "templateVersion": "1.0.0" }, "repository": { From af65161311e7ad618bbdd8a99d44290385ac1f88 Mon Sep 17 00:00:00 2001 From: David Cui Date: Thu, 2 Sep 2021 15:35:32 -0700 Subject: [PATCH 2/4] bump version to 1.1.0.0 for 1.1 release Signed-off-by: David Cui --- .github/workflows/draft-release-notes-workflow.yml | 2 +- .github/workflows/sql-odbc-release-workflow.yml | 2 +- .github/workflows/sql-odbc-rename-and-release-workflow.yml | 2 +- .github/workflows/sql-workbench-test-and-build-workflow.yml | 4 ++-- sql-cli/src/opensearch_sql_cli/__init__.py | 2 +- sql-jdbc/build.gradle | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index cc68eeab4a..0c6190bce1 100644 --- 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.0.0.0 + version: 1.1.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 index c7901f58c8..6e471248a5 100644 --- 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.0.0.0 + OD_VERSION: 1.1.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 index 467bf99121..cf79e281ff 100644 --- 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.0.0.0 + OD_VERSION: 1.1.0.0 jobs: upload-odbc: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index cad24e6899..071f7dfb29 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -4,8 +4,8 @@ on: [pull_request, push] 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.0 jobs: diff --git a/sql-cli/src/opensearch_sql_cli/__init__.py b/sql-cli/src/opensearch_sql_cli/__init__.py index e9f870deba..d4f6ce3d73 100644 --- 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.0.0.0" +__version__ = "1.1.0.0" diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 548b34a9be..516d3f5175 100644 --- 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.0.0.0' +version '1.1.0.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false")); if (snapshot) { From d3518298c8d50517613194323282e14a0ad55e6e Mon Sep 17 00:00:00 2001 From: David Cui Date: Thu, 2 Sep 2021 15:54:51 -0700 Subject: [PATCH 3/4] add release notes for 1.1 Signed-off-by: David Cui --- .../opensearch-sql.release-notes-1.1.0.0.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 release-notes/opensearch-sql.release-notes-1.1.0.0.md diff --git a/release-notes/opensearch-sql.release-notes-1.1.0.0.md b/release-notes/opensearch-sql.release-notes-1.1.0.0.md new file mode 100644 index 0000000000..473cca7551 --- /dev/null +++ b/release-notes/opensearch-sql.release-notes-1.1.0.0.md @@ -0,0 +1,24 @@ +## 2021-09-02 Version 1.1.0.0 + +Compatible with OpenSearch and OpenSearch Dashboards Version 1.1.0 + +### Enhancements + +* Support implicit type conversion from string to boolean ([#166](https://github.com/opensearch-project/sql/pull/166)) +* Support distinct count aggregation ([#167](https://github.com/opensearch-project/sql/pull/167)) +* Support implicit type conversion from string to temporal ([#171](https://github.com/opensearch-project/sql/pull/171)) +* Workbench: auto dump cypress test data, support security ([#199](https://github.com/opensearch-project/sql/pull/199)) + +### Bug Fixes + +* Fix for SQL-ODBC AWS Init and Shutdown Behaviour ([#163](https://github.com/opensearch-project/sql/pull/163)) +* Fix import path for cypress constant ([#201](https://github.com/opensearch-project/sql/pull/201)) + + +### Infrastructure + +* Add Integtest.sh for OpenSearch integtest setups (workbench) ([#157](https://github.com/opensearch-project/sql/pull/157)) +* Bump path-parse from 1.0.6 to 1.0.7 in /workbench ([#178](https://github.com/opensearch-project/sql/pull/178)) +* Use externally-defined OpenSearch version when specified. ([#179](https://github.com/opensearch-project/sql/pull/179)) +* Use OpenSearch 1.1 and build snapshot by default in CI. ([#181](https://github.com/opensearch-project/sql/pull/181)) +* Workbench: remove curl commands in integtest.sh ([#200](https://github.com/opensearch-project/sql/pull/200)) From e5473986d7f80d9bb27835ee11104738fdbf3271 Mon Sep 17 00:00:00 2001 From: David Cui Date: Thu, 2 Sep 2021 16:15:11 -0700 Subject: [PATCH 4/4] bump odbc files to 1.1.0.0 Signed-off-by: David Cui --- sql-odbc/src/CMakeLists.txt | 4 ++-- .../src/TableauConnector/opensearch_sql_odbc/manifest.xml | 2 +- .../src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index fd24ea9e8f..ae5db3b98c 100644 --- 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.0.0.0") -set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,0,0,0") +set(DRIVER_PACKAGE_VERSION "1.1.0.0") +set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,1,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 index 077e7d01d2..be2e73897c 100644 --- a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml +++ b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml b/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml index 0f470f3a8d..c59a0e74b0 100644 --- 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 @@ - +