From d9a8adec352374814382395b87fd034b0d5ab176 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Fri, 3 Mar 2017 10:38:06 +0100 Subject: SONAR-8883 Reenable assertion --- .../src/main/java/org/sonar/scanner/report/ReportPublisher.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sonar-scanner-engine/src') 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 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) -- cgit v1.2.3