aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2017-03-01 18:29:16 +0100
committerDuarte Meneses <duarte.meneses@sonarsource.com>2017-03-01 18:29:19 +0100
commita9c274308d4d8af97cd8d320fae8fc68e0a3e46f (patch)
treefafb3cb404c44b0e6683ff7ecdeb972830de78ac /sonar-scanner-engine
parent26c9558a68f0a55ff16410af866b82856a7498ce (diff)
downloadsonarqube-a9c274308d4d8af97cd8d320fae8fc68e0a3e46f.tar.gz
sonarqube-a9c274308d4d8af97cd8d320fae8fc68e0a3e46f.zip
SONAR-8783 Improve display of error when uploading scanner report
Diffstat (limited to 'sonar-scanner-engine')
-rw-r--r--sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java
index c06f344c8ab..7255cd82f62 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java
@@ -200,6 +200,7 @@ public class ReportPublisher implements Startable {
} else {
String publicUrl = server.getPublicRootUrl();
HttpUrl httpUrl = HttpUrl.parse(publicUrl);
+ String serverVersion = (server.getVersion() != null) ? server.getVersion() : "";
Map<String, String> metadata = new LinkedHashMap<>();
String effectiveKey = projectReactor.getRoot().getKeyWithBranch();
@@ -208,7 +209,7 @@ public class ReportPublisher implements Startable {
}
metadata.put("projectKey", effectiveKey);
metadata.put("serverUrl", publicUrl);
- metadata.put("serverVersion", server.getVersion());
+ metadata.put("serverVersion", serverVersion);
URL dashboardUrl = httpUrl.newBuilder()
.addPathSegment("dashboard").addPathSegment("index").addPathSegment(effectiveKey)