diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 59b9e6e7..407f1b6f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,7 +31,7 @@ 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 diff --git a/build.gradle b/build.gradle index 307af6f9..d9d83ec5 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.0.0") + opensearch_version = System.getProperty("opensearch.version", "1.1.0") } // Used to resolve build file dependencies @@ -68,7 +68,7 @@ spotbugsTest { } ext { - opensearchVersion = '1.0.0' + opensearchVersion = '1.1.0' isSnapshot = "true" == System.getProperty("build.snapshot", "true") // The RCA branch that will be built. Default value is main. @@ -348,12 +348,9 @@ task buildRca() { workingDir("$licenseDir") commandLine 'rm', "-f", "performanceanalyzer-rca-1.0.0.0.jar.sha1" } - exec { - workingDir("$projectDir") - commandLine './gradlew', 'updateShas' - } } } +buildRca.finalizedBy updateShas // This value is set by the unpackRca task def rcaArtifactsDir