X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-sonar.sh;h=9e00d2180e1c04774c941940e0ab13dbfac0e343;hb=b0de8e76ba8c4e2cacbef206d7864e856b1ffc1d;hp=e78d156f043074aea3d8d3cf2294218637d20e8c;hpb=2f674071c16e88158c78d1d8472c3f89821a9f2f;p=releng%2Fglobal-jjb.git

diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index e78d156f..9e00d218 100644
--- a/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@ -25,7 +25,7 @@ params+=("--settings $SETTINGS_FILE")
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN $MAVEN_GOALS \
+_JAVA_OPTIONS="$JAVA_OPTS" $MVN $MAVEN_GOALS \
     -e -Dsonar \
     ${params[*]} \
     $MAVEN_OPTIONS $MAVEN_PARAMS
@@ -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 \