diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index d2c1ecfed..ab5bbbeeb 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -32,17 +32,17 @@ jobs: ref: '1.0' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false # This step adds dependency, common-utils - name: Checkout common-utils uses: actions/checkout@v2 with: repository: 'opensearch-project/common-utils' path: common-utils - ref: 'main' + ref: '1.0' - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch uses: actions/checkout@v2 @@ -52,7 +52,7 @@ jobs: with: java-version: 14 - name: Run integration tests with multi node config - run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.0.0-rc1 -Dbuild.snapshot=false + run: ./gradlew integTest -PnumNodes=3 -Dopensearch.version=1.0.0 -Dbuild.snapshot=false - name: Pull and Run Docker run: | plugin=`ls alerting/build/distributions/*.zip` diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 91317b6a3..63e301404 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -38,7 +38,7 @@ jobs: ref: '1.0' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false # dependencies: common-utils - name: Checkout common-utils @@ -46,12 +46,13 @@ jobs: with: repository: 'opensearch-project/common-utils' path: common-utils + ref: '1.0' - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 - name: Build and run with Gradle - run: ./gradlew build -Dopensearch.version=1.0.0-rc1 + run: ./gradlew build -Dopensearch.version=1.0.0 # - name: Create Artifact Path # run: | @@ -70,4 +71,4 @@ jobs: # path: alerting-artifacts # Publish to local maven - name: Publish to Maven Local - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 diff --git a/build.gradle b/build.gradle index 3f6a8f43b..2464ece65 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,8 @@ buildscript { apply from: 'build-tools/repositories.gradle' ext { - opensearch_version = System.getProperty("opensearch.version", "1.0.0-rc1") - common_utils_version = '1.0.0.0-rc1' + opensearch_version = System.getProperty("opensearch.version", "1.0.0") + common_utils_version = '1.0.0.0' kotlin_version = '1.3.72' } @@ -93,7 +93,7 @@ allprojects { group = "org.opensearch" // Increment the final digit when there's a new plugin versions for the same opendistro version // Reset the final digit to 0 when upgrading to a new opendistro version - version = "${opendistroVersion}.0-rc1" + version = "${opendistroVersion}.0" apply from: "$rootDir/build-tools/repositories.gradle"