Browse Source

SONAR-10690 upgrade orchestrator to support editions

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

+ 1
- 1
build.gradle View File

dependency 'org.postgresql:postgresql:42.2.2' dependency 'org.postgresql:postgresql:42.2.2'
dependency 'org.reflections:reflections:0.9.9' dependency 'org.reflections:reflections:0.9.9'
dependency 'org.simpleframework:simple:4.1.21' 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') { dependency('org.sonarsource:sonar-persistit:3.3.2') {
exclude 'commons-logging:commons-logging' exclude 'commons-logging:commons-logging'
} }

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



import java.io.File; import java.io.File;


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

public class CreateDb { public class CreateDb {


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

import com.sonar.orchestrator.locator.FileLocation; import com.sonar.orchestrator.locator.FileLocation;
import java.io.File; import java.io.File;


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

public class ApiDefinitionDownloader { public class ApiDefinitionDownloader {


public static void main(String[] args) { public static void main(String[] args) {


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

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

import org.sonarqube.ws.client.settings.SetRequest; import org.sonarqube.ws.client.settings.SetRequest;


import static com.google.common.base.Preconditions.checkState; 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_LOGIN;
import static com.sonar.orchestrator.container.Server.ADMIN_PASSWORD; import static com.sonar.orchestrator.container.Server.ADMIN_PASSWORD;
import static java.lang.Double.parseDouble; import static java.lang.Double.parseDouble;


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

Loading…
Cancel
Save