diff options
| author | David Rautureau <david.rautureau@sonarsource.com> | 2018-02-08 15:01:19 +0100 |
|---|---|---|
| committer | David Rautureau <david.rautureau@sonarsource.com> | 2018-03-09 11:33:38 +0100 |
| commit | 1a17e4302e4b63de6b4ce7c049441803b9471524 (patch) | |
| tree | 031bcfbf302c7909c5b45a7c31f1bbc00a2fce34 /sonar-ws-generator/src/main/java/org | |
| parent | 21fbe3697bdb6e66016ef8d0bea49da574e02e7d (diff) | |
| download | sonarqube-1a17e4302e4b63de6b4ce7c049441803b9471524.tar.gz sonarqube-1a17e4302e4b63de6b4ce7c049441803b9471524.zip | |
Move To Gradle
Diffstat (limited to 'sonar-ws-generator/src/main/java/org')
| -rw-r--r-- | sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java | 9 | ||||
| -rw-r--r-- | sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/Helper.java | 2 |
2 files changed, 6 insertions, 5 deletions
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 29e210241fa..8c232851c21 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 @@ -20,6 +20,7 @@ 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.locator.FileLocation; @@ -32,10 +33,10 @@ public class ApiDefinitionDownloader { } public static String downloadApiDefinition() { - Orchestrator orchestrator = Orchestrator - .builderEnv() - .setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/target"), "sonarqube-*.zip").getFile()) - .build(); + OrchestratorBuilder builder = Orchestrator.builderEnv(); + builder.setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile()) + .setOrchestratorProperty("orchestrator.workspaceDir", "build"); + Orchestrator orchestrator = builder.build(); orchestrator.start(); try { diff --git a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/Helper.java b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/Helper.java index f76decd69a6..0d12506fd38 100644 --- a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/Helper.java +++ b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/Helper.java @@ -37,7 +37,7 @@ import static java.util.Arrays.asList; public class Helper { static final Set<String> PATH_EXCLUSIONS = new HashSet<>(asList("api/orchestrator")); - private static final String OUTPUT_DIR = "target/generated-sources/results"; + private static final String OUTPUT_DIR = "build/generated-sources/results"; private final Map<String, List<String[]>> responseTypes; public Helper() { |