SONAR-10690 upgrade orchestrator to support editions

diff --git a/build.gradle b/build.gradle
index 82c60eb70770278d929b99af323c09bd8d47690a..1884843ad269810026062168defa94f48a81be54 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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'
       }

diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
index b448b25fa87391803cc21fb34b31ef0b9d86d5cd..25ec3a62482730205f7588f550530e65a9d795e8 100644 (file)
--- a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java
@@ -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();

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 b9ccb41c9bdd7fe66df071e7b18dbec5bfc16a11..7f9748a1f7c597785d165012aa70d55185846f19 100644 (file)
--- a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
+++ b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
@@ -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

diff --git a/tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java
index 189eb59a0481fefe1152d14a01d75153ab3bb816..bb5f42009ca5a4fbf1aca800bfe33a01044b725d 100644 (file)
--- a/tests/src/test/java/util/ItUtils.java
+++ b/tests/src/test/java/util/ItUtils.java
@@ -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();