From bb6d72971e884411e2e69f0c2486d8b547f802e9 Mon Sep 17 00:00:00 2001
From: dblock <dblock@amazon.com>
Date: Mon, 16 Aug 2021 15:10:48 +0000
Subject: [PATCH] Use OpenSearch 1.1 and build snapshot by default.

Signed-off-by: dblock <dblock@amazon.com>
---
 .github/workflows/sql-test-and-build-workflow.yml | 6 +++---
 build.gradle                                      | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
index 816056bd33..8d7ffe1edd 100644
--- a/.github/workflows/sql-test-and-build-workflow.yml
+++ b/.github/workflows/sql-test-and-build-workflow.yml
@@ -21,14 +21,14 @@ jobs:
       with:
         repository: 'opensearch-project/OpenSearch'
         path: OpenSearch
-        ref: '1.0'
+        ref: '1.x'
 
     - name: Build OpenSearch
       working-directory: ./OpenSearch
-      run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
+      run: ./gradlew publishToMavenLocal
     
     - name: Build with Gradle
-      run: ./gradlew build assemble
+      run: ./gradlew build assemble -Dopensearch.version=1.1.0-SNAPSHOT
 
     - name: Create Artifact Path
       run: |
diff --git a/build.gradle b/build.gradle
index 76aaf4099d..fce02d546e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.0.0")
+        opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
     }
 
     repositories {
@@ -55,13 +55,11 @@ repositories {
 }
 
 ext {
-    opensearchVersion = System.getProperty("opensearch.version", "1.0.0")
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 
 allprojects {
-    version = "${opensearchVersion}" - "-SNAPSHOT" + ".0"
-
+    version = opensearch_version - "-SNAPSHOT" + ".0"
     if (isSnapshot) {
         version += "-SNAPSHOT"
     }