diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2025-01-09 16:46:00 +0100 |
---|---|---|
committer | Julien HENRY <julien.henry@sonarsource.com> | 2025-01-09 16:46:00 +0100 |
commit | 4bf22616d3b0a5d7a854e25f6f1e7b0b829c9e80 (patch) | |
tree | 681a9e917ae55eedf3720a360fb2ed45504a0a93 | |
parent | 653489e72843b4d42cd879d541d94e108c0553d2 (diff) | |
download | sonar-scanner-cli-jh/update-headers.tar.gz sonar-scanner-cli-jh/update-headers.zip |
Fix ITs now that SQS 2025.1 stopped supporting username/passwordjh/update-headers
-rw-r--r-- | it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java index 3b78a06..6b12552 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java @@ -116,8 +116,12 @@ public abstract class ScannerTestCase { SonarScanner newScannerWithAdminCredentials(File baseDir, String... keyValueProperties) { SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties); scannerCli.setScannerVersion(artifactVersion().toString()); - scannerCli.setProperty("sonar.login", Server.ADMIN_LOGIN); - scannerCli.setProperty("sonar.password", Server.ADMIN_PASSWORD); + if (orchestrator.getServer().version().isGreaterThanOrEquals(25, 1)) { + scannerCli.setProperty("sonar.token", orchestrator.getDefaultAdminToken()); + } else { + scannerCli.setProperty("sonar.login", Server.ADMIN_LOGIN); + scannerCli.setProperty("sonar.password", Server.ADMIN_PASSWORD); + } return scannerCli; } |