aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
Diffstat (limited to 'it')
-rw-r--r--it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java8
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;
}