X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Fmaven-sonar.sh;h=9e00d2180e1c04774c941940e0ab13dbfac0e343;hb=c8b9acd166fcbd88139a65f7721e522980a0e013;hp=58572341058dfc110a23b2d722fa957f7ef75c3f;hpb=11bccd3d96d180f93ae96cd330e23565ba351aa5;p=releng%2Fglobal-jjb.git

diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index 58572341..9e00d218 100644
--- a/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@ -8,7 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
+echo "---> maven-sonar.sh"
 # This script builds a Maven project and deploys it into a staging repo which
 # can be used to deploy elsewhere later eg. Nexus staging / snapshot repos.
 
@@ -19,18 +19,32 @@ set +u
 
 export MAVEN_OPTS
 
+declare -a params
+params+=("--global-settings $GLOBAL_SETTINGS_FILE")
+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 \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
+    ${params[*]} \
     $MAVEN_OPTIONS $MAVEN_PARAMS
 
+if [ "$SONAR_HOST_URL" = "https://sonarcloud.io" ]; then
+    params+=("-Dsonar.projectKey=$PROJECT_KEY")
+    params+=("-Dsonar.organization=$PROJECT_ORGANIZATION")
+    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 \
+"$MVN" $SONAR_MAVEN_GOAL \
     -e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
+    ${params[*]} \
     $MAVEN_OPTIONS $MAVEN_PARAMS