diff options
| author | Antoine Vigneau <antoine.vigneau@sonarsource.com> | 2023-12-06 16:29:06 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-12-07 20:03:15 +0000 |
| commit | 32a1a4dae1fdc1c366975cf98f44423b7b0b07c2 (patch) | |
| tree | efc99fa89afccd04f8ff98b007c9e6aba8435220 /sonar-ws-generator | |
| parent | 8b15bdf5aab5461c17e7f78674db5b9085f394f2 (diff) | |
| download | sonarqube-32a1a4dae1fdc1c366975cf98f44423b7b0b07c2.tar.gz sonarqube-32a1a4dae1fdc1c366975cf98f44423b7b0b07c2.zip | |
SONAR-20652 Upgrade Orchestrator to 4.5.0.1700
Diffstat (limited to 'sonar-ws-generator')
| -rw-r--r-- | sonar-ws-generator/build.gradle | 2 | ||||
| -rw-r--r-- | sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sonar-ws-generator/build.gradle b/sonar-ws-generator/build.gradle index a57236825a8..df3d2ac2ef2 100644 --- a/sonar-ws-generator/build.gradle +++ b/sonar-ws-generator/build.gradle @@ -13,7 +13,7 @@ dependencies { api 'commons-collections:commons-collections:3.2.2' api 'org.apache.velocity:velocity:1.7' api 'org.slf4j:log4j-over-slf4j' - api 'org.sonarsource.orchestrator:sonar-orchestrator' + api 'org.sonarsource.orchestrator:sonar-orchestrator-junit4' compileOnlyApi 'com.google.code.findbugs:jsr305' } diff --git a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java index f448bc3540c..3e1f0c4c48b 100644 --- a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java +++ b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java @@ -19,10 +19,10 @@ */ package org.sonarqube.wsgenerator; -import com.sonar.orchestrator.Orchestrator; -import com.sonar.orchestrator.OrchestratorBuilder; import com.sonar.orchestrator.http.HttpCall; import com.sonar.orchestrator.http.HttpResponse; +import com.sonar.orchestrator.junit4.OrchestratorRule; +import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder; import com.sonar.orchestrator.locator.FileLocation; import java.io.File; @@ -35,12 +35,12 @@ public class ApiDefinitionDownloader { } public static String downloadApiDefinition() { - OrchestratorBuilder builder = Orchestrator.builderEnv() + OrchestratorRuleBuilder builder = OrchestratorRule.builderEnv() .defaultForceAuthentication(); builder.setEdition(COMMUNITY); builder.setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile()) .setOrchestratorProperty("orchestrator.workspaceDir", "build"); - Orchestrator orchestrator = builder.setServerProperty("sonar.forceAuthentication", "false") + OrchestratorRule orchestrator = builder.setServerProperty("sonar.forceAuthentication", "false") .build(); orchestrator.start(); |