Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Add step to verify stage repo is closed"
[releng/global-jjb.git]
/
shell
/
maven-sonar.sh
diff --git
a/shell/maven-sonar.sh
b/shell/maven-sonar.sh
index
e0c0477
..
d370748
100644
(file)
--- a/
shell/maven-sonar.sh
+++ b/
shell/maven-sonar.sh
@@
-1,4
+1,4
@@
-#!/bin/bash
+#!/bin/bash
-l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@
-8,7
+8,7
@@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
# 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.
# 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,26
@@
set +u
export MAVEN_OPTS
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
# 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 \
-e -Dsonar \
- --global-settings "$GLOBAL_SETTINGS_FILE" \
- --settings "$SETTINGS_FILE" \
+ ${params[*]} \
$MAVEN_OPTIONS $MAVEN_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
+
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
# 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" \
-e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
- --global-settings "$GLOBAL_SETTINGS_FILE" \
- --settings "$SETTINGS_FILE" \
+ ${params[*]} \
$MAVEN_OPTIONS $MAVEN_PARAMS
$MAVEN_OPTIONS $MAVEN_PARAMS