Add sonar-prescan-script jobs for maven

[releng/global-jjb.git] / shell / maven-sonar.sh

diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index 706697b..9e00d21 100644 (file)
--- 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 clean install \
+_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 \