Browse Source

SONAR-10690 upgrade orchestrator to support editions

tags/7.5
Simon Brandhof 5 years ago
parent
commit
02f499b51b

+ 1
- 1
build.gradle View File

@@ -207,7 +207,7 @@ subprojects {
dependency 'org.postgresql:postgresql:42.2.2'
dependency 'org.reflections:reflections:0.9.9'
dependency 'org.simpleframework:simple:4.1.21'
dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1599'
dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1621'
dependency('org.sonarsource:sonar-persistit:3.3.2') {
exclude 'commons-logging:commons-logging'
}

+ 3
- 0
server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java View File

@@ -26,10 +26,13 @@ import org.apache.commons.lang.StringUtils;

import java.io.File;

import static com.sonar.orchestrator.container.Edition.COMMUNITY;

public class CreateDb {

public static void main(String[] args) {
OrchestratorBuilder builder = Orchestrator.builderEnv();
builder.setEdition(COMMUNITY);
String version = System.getProperty("sonar.runtimeVersion");
if (StringUtils.isEmpty(version)) {
File zip = FileLocation.byWildcardMavenFilename(new File("../../sonar-application/build/distributions"), "sonar-application-*.zip").getFile();

+ 3
- 0
sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java View File

@@ -26,6 +26,8 @@ import com.sonar.orchestrator.http.HttpResponse;
import com.sonar.orchestrator.locator.FileLocation;
import java.io.File;

import static com.sonar.orchestrator.container.Edition.COMMUNITY;

public class ApiDefinitionDownloader {

public static void main(String[] args) {
@@ -34,6 +36,7 @@ public class ApiDefinitionDownloader {

public static String downloadApiDefinition() {
OrchestratorBuilder builder = Orchestrator.builderEnv();
builder.setEdition(COMMUNITY);
builder.setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile())
.setOrchestratorProperty("orchestrator.workspaceDir", "build");
Orchestrator orchestrator = builder

+ 2
- 0
tests/src/test/java/util/ItUtils.java View File

@@ -80,6 +80,7 @@ import org.sonarqube.ws.client.settings.ResetRequest;
import org.sonarqube.ws.client.settings.SetRequest;

import static com.google.common.base.Preconditions.checkState;
import static com.sonar.orchestrator.container.Edition.COMMUNITY;
import static com.sonar.orchestrator.container.Server.ADMIN_LOGIN;
import static com.sonar.orchestrator.container.Server.ADMIN_PASSWORD;
import static java.lang.Double.parseDouble;
@@ -99,6 +100,7 @@ public class ItUtils {

public static OrchestratorBuilder newOrchestratorBuilder() {
OrchestratorBuilder builder = Orchestrator.builderEnv();
builder.setEdition(COMMUNITY);
String version = System.getProperty("sonar.runtimeVersion");
if (StringUtils.isEmpty(version)) {
File zip = FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile();

Loading…
Cancel
Save