X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-sonar.sh;fp=shell%2Fmaven-sonar.sh;h=9e00d2180e1c04774c941940e0ab13dbfac0e343;hb=09979e2fde9b92aa7bc00de4175a88d64fe9e33f;hp=d370748bbada693b84b222ad5f6cd596f618d4c9;hpb=33e49c57ff646e8bad3d033ee770df88d8051f73;p=releng%2Fglobal-jjb.git diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh index d370748b..9e00d218 100644 --- a/shell/maven-sonar.sh +++ b/shell/maven-sonar.sh @@ -36,6 +36,12 @@ if [ "$SONAR_HOST_URL" = "https://sonarcloud.io" ]; then params+=("-Dsonar.login=$API_TOKEN") fi +if [ "$SET_JDK_VERSION" != "$SONARCLOUD_JAVA_VERSION" ]; then + export SET_JDK_VERSION="$SONARCLOUD_JAVA_VERSION" + bash <(curl -s https://raw.githubusercontent.com/lfit/releng-global-jjb/master/shell/update-java-alternatives.sh) + source /tmp/java.env +fi + # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters. # shellcheck disable=SC2086 "$MVN" $SONAR_MAVEN_GOAL \