From: Jacek <52388493+jacek-poreda-sonarsource@users.noreply.github.com>
Date: Mon, 30 Sep 2019 13:43:00 +0000 (+0200)
Subject: Update travis utils version for appveyor (#75)
X-Git-Tag: 4.2.0.1873~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=70da1689e80a7afd3f107e9ae9d3deac94f6c9b9;p=sonar-scanner-cli.git

Update travis utils version for appveyor (#75)
---

diff --git a/appveyor.ps1 b/appveyor.ps1
index b3ecc55..a8a81f1 100644
--- a/appveyor.ps1
+++ b/appveyor.ps1
@@ -32,7 +32,7 @@ function FetchAndUnzip
 
 function InstallAppveyorTools
 {
-        $travisUtilsVersion = "33"
+        $travisUtilsVersion = "57"
         $localPath = "$env:USERPROFILE\.local"
         $travisUtilsPath = "$localPath\travis-utils-$travisUtilsVersion"
         if (Test-Path $travisUtilsPath)
diff --git a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
index 1dbbbec..a5c8b5f 100644
--- a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
@@ -33,6 +33,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+import org.sonarsource.scanner.api.internal.shaded.minimaljson.Json;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
@@ -326,7 +327,11 @@ public class ConfTest {
     Properties properties = conf.properties();
     assertThat(properties.get("sonar.prop")).isEqualTo("default");
 
-    env.put("SONARQUBE_SCANNER_PARAMS", "{\"project.settings\" : \"" + home.resolve("conf/sq-project.properties").toAbsolutePath().toString() + "\"}");
+    String jsonString = Json.object()
+      .add("project.settings", home.resolve("conf/sq-project.properties").toAbsolutePath().toString())
+      .toString();
+
+    env.put("SONARQUBE_SCANNER_PARAMS", jsonString);
 
     properties = conf.properties();
     assertThat(properties.get("sonar.prop")).isEqualTo("expected");