Use standard snapshot build settings and OpenSearch 1.x. (opensearch-…

…project#49)

Signed-off-by: dblock <[email protected]>

.github/workflows/test-and-build-workflow.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/OpenSearch'
-          ref: 'main'
+          ref: '1.x'
           path: OpenSearch
       - name: Build OpenSearch
         working-directory: ./OpenSearch
@@ -39,11 +39,11 @@ jobs:
       # job-scheduler
       - name: Build and Test
         run: |
-          ./gradlew build -Dbuild.snapshot=false
+          ./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT
 
       - name: Publish to Maven Local
         run: |
-          ./gradlew publishToMavenLocal -Dbuild.snapshot=false
+          ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
           
       - name: Upload Coverage Report
         uses: codecov/codecov-action@v1

build.gradle

@@ -44,11 +44,6 @@ plugins {
     id 'java-library'
 }
 
-ext {
-    opensearchVersion = "${version}"
-    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-}
-
 apply plugin: 'opensearch.opensearchplugin'
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.java-rest-test'
@@ -84,17 +79,19 @@ testClusters.javaRestTest {
     testDistribution = 'INTEG_TEST'
 }
 
+ext {
+    isSnapshot = "true" == System.getProperty("build.snapshot", "true")
+}
+
 allprojects {
     group = 'org.opensearch'
-    version = "${opensearchVersion}.0"
-
-    apply from: "$rootDir/build-tools/repositories.gradle"
-
-    boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true"));
-    if (snapshot) {
+    version = opensearch_version - '-SNAPSHOT' + '.0'
+    if (isSnapshot) {
         version += "-SNAPSHOT"
     }
 
+    apply from: "$rootDir/build-tools/repositories.gradle"
+
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"
     }