Bumps version to 1.2 (#254)

* 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> * bump version to 1.2 changes Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com> * fix broken link Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com> * Remove unnecessary stubs Signed-off-by: Joshua Li <joshuali925@gmail.com> Co-authored-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>
opensearch-project · Nov 4, 2021 · fe7e867 · fe7e867
1 parent 6dae7b2
commit fe7e867
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 25 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-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
@@ -16,7 +16,7 @@ jobs:
         java-version: 1.14
 
     - name: Build with Gradle
-      run: ./gradlew build assemble -Dopensearch.version=1.1.0-SNAPSHOT
+      run: ./gradlew build assemble -Dopensearch.version=1.2.0-SNAPSHOT
 
     - name: Create Artifact Path
       run: |

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.x'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.1
+  OPENSEARCH_VERSION: '1.2'
+  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
@@ -4,8 +4,8 @@ on: [pull_request, push]
 
 env: 
   PLUGIN_NAME: query-workbench-dashboards
-  OPENSEARCH_VERSION: '1.x'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
+  OPENSEARCH_VERSION: '1.2'
+  OPENSEARCH_PLUGIN_VERSION: 1.2.0.0
 
 jobs:
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,7 +39,7 @@ If you would like to contribute to the documentation, please do so in the [docum
 
 As with other types of contributions, the first step is to [**open an issue on GitHub**](https://github.com/opensearch-project/sql/issues/new/choose). Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem. It also lets us all work together to find the right approach before you spend a bunch of time on a PR. So again, when in doubt, open an issue.
 
-Once you've opened an issue, check out our [Developer Guide](./DEVELOPER_GUIDE.md) for instructions on how to get started.
+Once you've opened an issue, check out our [Developer Guide](./DEVELOPER_GUIDE.rst) for instructions on how to get started.
 
 ## Developer Certificate of Origin
 

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/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/ComparisonTestTest.java
@@ -65,7 +65,6 @@ public class ComparisonTestTest {
 
   @Before
   public void setUp() {
-    when(openSearchConnection.getDatabaseName()).thenReturn("OpenSearch");
     when(otherDbConnection.getDatabaseName()).thenReturn("Other");
     correctnessTest = new ComparisonTest(
         openSearchConnection, new DBConnection[] {otherDbConnection}
@@ -119,7 +118,6 @@ public void testSuccessFinally() {
     DBResult anotherDbResult = new DBResult("Another DB", asList(new Type("firstname", "text")),
         asList(new Row(asList("John"))));
     when(openSearchConnection.select(anyString())).thenReturn(openSearchResult);
-    when(otherDbConnection.select(anyString())).thenReturn(otherDbResult);
     when(anotherDbConnection.select(anyString())).thenReturn(anotherDbResult);
 
     TestReport expected = new TestReport();
@@ -191,8 +189,6 @@ public void testSuccessWhenOneDBSupportThisQuery() {
     when(openSearchConnection.select(anyString())).thenReturn(
         new DBResult("OpenSearch", asList(new Type("firstname", "text")), asList(new Row(asList("John"))))
     );
-    when(otherDbConnection.select(anyString()))
-        .thenThrow(new RuntimeException("Unsupported feature"));
     when(anotherDbConnection.select(anyString())).thenReturn(
         new DBResult("Another DB", asList(new Type("firstname", "text")),
             asList(new Row(asList("John"))))

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-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.1'
+version '1.2.0.0'
 
 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.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 @@