From 7ecd930712340a63ccd4230e0bd747028ef1f399 Mon Sep 17 00:00:00 2001 From: Khushboo Rajput Date: Fri, 17 Nov 2023 10:21:29 +0530 Subject: [PATCH 1/2] Update build.gradle to use isSnapshot logic Signed-off-by: Khushboo Rajput --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d67966e79..472190b7c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,10 @@ buildscript { buildVersionQualifier = System.getProperty("build.version_qualifier", "") buildDockerJdkVersion = System.getProperty("build.docker_jdk_ver", "11") + // The PA Commons (https://github.com/opensearch-project/performance-analyzer-commons) + // is a library dependency with hardcoded versioning in PA and RCA repos. + paCommonsVersion = "1.2.0" + // 2.x.0-SNAPSHOT -> 2.x.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' @@ -19,6 +23,7 @@ buildscript { } if (isSnapshot) { opensearch_build += "-SNAPSHOT" + paCommonsVersion += "-SNAPSHOT" } gitPaBranch = '2.11' gitPaRepo = "https://github.com/opensearch-project/performance-analyzer.git" @@ -353,7 +358,7 @@ dependencies { implementation 'org.checkerframework:checker-qual:3.29.0' implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}" - implementation "org.opensearch:performance-analyzer-commons:1.2.0-SNAPSHOT" + implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${commonslangVersion}" From 8d36b955579df10924fb01cde41cb4717760b350 Mon Sep 17 00:00:00 2001 From: Khushboo Rajput Date: Fri, 17 Nov 2023 12:00:19 +0530 Subject: [PATCH 2/2] Point PA branch to 2.11 for gradle build Signed-off-by: Khushboo Rajput --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 383a384e5..d8393e1f7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v2 with: repository: opensearch-project/performance-analyzer - ref: 2.x + ref: 2.11 path: ./tmp/performance-analyzer - name: Build PA gradle using the new RCA jar working-directory: ./tmp/performance-analyzer