aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2017-03-03 10:38:06 +0100
committerJulien HENRY <julien.henry@sonarsource.com>2017-03-03 10:38:58 +0100
commitd9a8adec352374814382395b87fd034b0d5ab176 (patch)
tree997f86ac1cc18579cb3f434621ffe1965b3c691e /sonar-scanner-engine/src
parent09e3a1a00d6149d707e5a67bfe0785b0204e34f4 (diff)
downloadsonarqube-d9a8adec352374814382395b87fd034b0d5ab176.tar.gz
sonarqube-d9a8adec352374814382395b87fd034b0d5ab176.zip
SONAR-8883 Reenable assertion
Diffstat (limited to 'sonar-scanner-engine/src')
-rw-r--r--sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java4
1 files changed, 1 insertions, 3 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 7255cd82f62..bb38c3ea6e0 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
@@ -21,7 +21,6 @@ package org.sonar.scanner.report;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Throwables;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -200,7 +199,6 @@ 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();
@@ -209,7 +207,7 @@ public class ReportPublisher implements Startable {
}
metadata.put("projectKey", effectiveKey);
metadata.put("serverUrl", publicUrl);
- metadata.put("serverVersion", serverVersion);
+ metadata.put("serverVersion", server.getVersion());
URL dashboardUrl = httpUrl.newBuilder()
.addPathSegment("dashboard").addPathSegment("index").addPathSegment(effectiveKey)