Build against OpenSearch 1.0.0 and bump artifact version to 1.0.0.0 (#…

…146) * Bump OpenSearch version from rc1 to 1.0.0 Signed-off-by: Chen Dai <[email protected]> * Rename JDBC artifact by removing -rc1 Signed-off-by: Chen Dai <[email protected]> * Remove rc1 qualifier in build workflow Signed-off-by: Chen Dai <[email protected]> * Remove rc1 from build tools version Signed-off-by: Chen Dai <[email protected]> * Fix IT failure Signed-off-by: Chen Dai <[email protected]> * Rollback build tools to rc1 due to known issue Signed-off-by: Chen Dai <[email protected]> * Bump CLI version Signed-off-by: Chen Dai <[email protected]> * Bump query workbench version Signed-off-by: Chen Dai <[email protected]> * Build against 1.0.0 Signed-off-by: Chen Dai <[email protected]> * Update release notes drafter Signed-off-by: Chen Dai <[email protected]> * Update nodejs to 10.24.1 Signed-off-by: Chen Dai <[email protected]>
opensearch-project · Jun 30, 2021 · 47f5534 · 47f5534
1 parent 5a6a3e8
commit 47f5534
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - develop
+      - main
 
 jobs:
   update_release_draft:
@@ -16,6 +16,6 @@ jobs:
         with:
           config-name: draft-release-notes-config.yml
           tag: (None)
-          version: 1.0.0.0-rc1
+          version: 1.0.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
@@ -25,7 +25,7 @@ jobs:
 
     - name: Build OpenSearch
       working-directory: ./OpenSearch
-      run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false
+      run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
 
     - name: Build with Gradle
       run: ./gradlew build assemble

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.0'
-  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1
+  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
 
 jobs:
 
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.23.1'
+          node-version: '10.24.1'
 
       - name: Move Workbench to Plugins Dir
         run: |

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.0'
-  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1
+  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
 
 jobs:
 
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.23.1'
+          node-version: '10.24.1'
 
       - name: Move Workbench to Plugins Dir
         run: |

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@
 
 buildscript {
     ext {
-        opensearch_version = "1.0.0-rc1"
+        opensearch_version = "1.0.0"
     }
 
     repositories {
@@ -60,7 +60,7 @@ ext {
 }
 
 allprojects {
-    version = "${opensearchVersion}.0-rc1"
+    version = "${opensearchVersion}.0"
 
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"

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.0.0.0-rc1"
+__version__ = "1.0.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.0.0.0-rc1'
+version '1.0.0.0'
 
 boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
 if (snapshot) {

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

diff --git a/workbench/package.json b/workbench/package.json
@@ -1,13 +1,13 @@
 {
   "name": "opensearch-query-workbench",
-  "version": "1.0.0.0-rc1",
+  "version": "1.0.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-rc1",
-    "templateVersion": "1.0.0-rc1"
+    "version": "1.0.0",
+    "templateVersion": "1.0.0"
   },
   "repository": {
     "type": "git",
@@ -47,7 +47,7 @@
     "tslint-plugin-prettier": "^2.0.1"
   },
   "engines": {
-    "node": "10.23.1",
+    "node": "10.24.1",
     "yarn": "^1.21.1"
   },
   "resolutions": {