diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2017-03-02 13:10:07 +0100 |
|---|---|---|
| committer | Julien HENRY <henryju@yahoo.fr> | 2017-03-02 16:24:43 +0100 |
| commit | ea8d74d2617e334ffbf827ec29a6accb8a7c1cfc (patch) | |
| tree | f606efb068dafe590df4209d3de47dbc5e5df250 /sonar-scanner-engine/src/main | |
| parent | bec1de9fc1f6c8bdd9a463dd3c514703f8b7f273 (diff) | |
| download | sonarqube-ea8d74d2617e334ffbf827ec29a6accb8a7c1cfc.tar.gz sonarqube-ea8d74d2617e334ffbf827ec29a6accb8a7c1cfc.zip | |
SONAR-8883 Fix Server::getVersion() on scanner side, and reenable IssueJsonReportTest IT
Diffstat (limited to 'sonar-scanner-engine/src/main')
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java index 8467e86097c..06f72c3d250 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java @@ -24,6 +24,7 @@ import java.util.Date; import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; import org.sonar.api.CoreProperties; +import org.sonar.api.SonarRuntime; import org.sonar.api.batch.ScannerSide; import org.sonar.api.config.Settings; import org.sonar.api.platform.Server; @@ -37,10 +38,12 @@ public class DefaultServer extends Server { private final Settings settings; private final ScannerWsClient client; + private final SonarRuntime runtime; - public DefaultServer(Settings settings, ScannerWsClient client) { + public DefaultServer(Settings settings, ScannerWsClient client, SonarRuntime runtime) { this.settings = settings; this.client = client; + this.runtime = runtime; } @Override @@ -50,7 +53,7 @@ public class DefaultServer extends Server { @Override public String getVersion() { - return settings.getString(CoreProperties.SERVER_VERSION); + return runtime.getApiVersion().toString(); } @Override |