Merge branch '1.1-bump-version' of https://github.com/davidcui1225/da…

…shboards-reports into 1.1-bump-version

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

@@ -3,9 +3,10 @@ name: Test and Build Reports Scheduler
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.0.0'
-  COMMON_UTILS_VERSION: '1.0'
-  JOB_SCHEDULER_VERSION: '1.0'
+  OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
+  OPENSEARCH_BRANCH: '1.x'
+  COMMON_UTILS_BRANCH: 'main'
+  JOB_SCHEDULER_BRANCH: 'main'
 
 jobs:
   build:
@@ -23,17 +24,17 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          ref: ${{ env.OPENSEARCH_BRANCH }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
-        run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal
 
       # dependencies: common-utils
       - name: Checkout common-utils
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: ${{ env.COMMON_UTILS_VERSION }}
+          ref: ${{ env.COMMON_UTILS_BRANCH }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
@@ -44,11 +45,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/job-scheduler'
-          ref: ${{ env.JOB_SCHEDULER_VERSION }}
+          ref: ${{ env.JOB_SCHEDULER_BRANCH }}
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # reports-scheduler
       - name: Checkout Reports Scheduler

reports-scheduler/build.gradle

@@ -30,10 +30,12 @@ import java.util.concurrent.Callable
 buildscript {
     ext {
         opensearch_group = "org.opensearch"
-        opensearch_version = System.getProperty("opensearch.version", "1.0.0")
+        opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
+        // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
+        opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
+        common_utils_version = System.getProperty("common_utils.version", opensearch_build)
+        job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)   
         kotlin_version = System.getProperty("kotlin.version", "1.4.0")
-        common_utils_version = "1.0.0.0"
-        job_scheduler_version = "1.0.0.0"
     }
 
     repositories {
@@ -109,11 +111,6 @@ ext {
     licenseFile = rootProject.file('LICENSE.txt')
     noticeFile = rootProject.file('NOTICE.txt')
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    opensearchVersion = "${version}.0"
-}
-
-if (isSnapshot) {
-    version += "-SNAPSHOT"
 }
 
 plugins.withId('java') {
@@ -126,7 +123,10 @@ plugins.withId('org.jetbrains.kotlin.jvm') {
 
 allprojects {
     group = "org.opensearch"
-    version = "${opensearchVersion}"
+    version = "${opensearch_version}" - "-SNAPSHOT" + ".0"
+    if (isSnapshot) {
+        version += "-SNAPSHOT"
+    } 
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"
     }