From 02f499b51bcf8a681fb2acfadc8c88c8e4dd4f9d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 31 May 2018 13:57:24 +0200
Subject: [PATCH] SONAR-10690 upgrade orchestrator to support editions

---
 build.gradle                                                   | 2 +-
 server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java  | 3 +++
 .../org/sonarqube/wsgenerator/ApiDefinitionDownloader.java     | 3 +++
 tests/src/test/java/util/ItUtils.java                          | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 82c60eb7077..1884843ad26 100644
--- 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 b448b25fa87..25ec3a62482 100644
--- 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 b9ccb41c9bd..7f9748a1f7c 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
@@ -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 189eb59a048..bb5f42009ca 100644
--- 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();
-- 
2.39.5