Skip to content

Commit

Permalink
Fix SHA update for PA-Commons repo in build.gradle
Browse files Browse the repository at this point in the history
Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
  • Loading branch information
khushbr committed May 30, 2023
1 parent 99728bf commit 6a96dc1
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ buildscript {
pa_bwc_version = System.getProperty("tests.bwc.version", default_bwc_version)
baseName = "paBwcCluster"

// 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.0.0"

// 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
Expand All @@ -22,6 +26,8 @@ buildscript {
}
if (isSnapshot) {
opensearch_build += "-SNAPSHOT"
paCommonsVersion += "-SNAPSHOT"

}
}

Expand Down Expand Up @@ -259,13 +265,14 @@ checkstyleTest.enabled = false

dependencies {

def junitVersion = "${versions.junit}"
def jacksonVersion = "${versions.jackson}"
def jacksonDataBindVersion = "${versions.jackson_databind}"
def nettyVersion = "${versions.netty}"
def junitVersion = "${versions.junit}"
def log4jVersion = "${versions.log4j}"
def guavaVersion = "${versions.guava}"

def log4jVersion = "${versions.log4j}"
def protobufVersion = "${versions.protobuf}"
def nettyVersion = "${versions.netty}"

configurations {
// jarHell reports class name conflicts between securemock and mockito-core
Expand Down Expand Up @@ -299,7 +306,7 @@ dependencies {
implementation 'org.apache.commons:commons-lang3:3.9'
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
implementation "org.opensearch:performance-analyzer-commons:1.0.0-SNAPSHOT"
implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
implementation "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
Expand Down Expand Up @@ -389,6 +396,11 @@ dependencyLicenses {
}

dependencyLicenses.doFirst {
def licenseDir = "$projectDir/licenses"
exec {
workingDir("$licenseDir")
commandLine 'rm', "-f", "performance-analyzer-commons-${paCommonsVersion}.jar.sha1"
}
updateShas.updateShas()
}

Expand Down

0 comments on commit 6a96dc1

Please sign in to comment.