Group its

14 files changed, 30 insertions, 3 deletions

diff --git a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
index 6eca10ab2bd..8ffd47fe53d 100644
--- a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
+++ b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
@@ -45,6 +45,7 @@ public class AdministrationTestSuite {
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .setServerProperty("sonar.notifications.delay", "1")
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.pluginArtifact("property-sets-plugin"))
     .addPlugin(ItUtils.pluginArtifact("sonar-subcategories-plugin"))
 
diff --git a/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
index a177c1df196..06d0efefbde 100644
--- a/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
+++ b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
@@ -46,6 +46,7 @@ public class AnalysisTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
     .build();
 }
diff --git a/it/it-tests/src/test/java/batch/BatchTest.java b/it/it-tests/src/test/java/batch/BatchTest.java
index e0e03509df1..d4482b92789 100644
--- a/it/it-tests/src/test/java/batch/BatchTest.java
+++ b/it/it-tests/src/test/java/batch/BatchTest.java
@@ -37,6 +37,7 @@ public class BatchTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
     .setContext("/")
 
diff --git a/it/it-tests/src/test/java/batch/IssuesModeTest.java b/it/it-tests/src/test/java/batch/IssuesModeTest.java
index e4c0f3306a1..651546c0535 100644
--- a/it/it-tests/src/test/java/batch/IssuesModeTest.java
+++ b/it/it-tests/src/test/java/batch/IssuesModeTest.java
@@ -50,8 +50,10 @@ public class IssuesModeTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
     .setContext("/")
+
     .addPlugin(ItUtils.pluginArtifact("access-secured-props-plugin"))
     .build();
 
diff --git a/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java b/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java
index b415e496be4..cc375155a6a 100644
--- a/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java
+++ b/it/it-tests/src/test/java/batch/SettingsEncryptionTest.java
@@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class SettingsEncryptionTest {
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.pluginArtifact("settings-encryption-plugin"))
     .addPlugin(ItUtils.xooPlugin())
     .build();
diff --git a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
index 4e77fd34e44..0431a2dbd02 100644
--- a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
+++ b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
@@ -22,6 +22,7 @@ public class BatchTestSuite {
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .addPlugin(ItUtils.xooPlugin())
+    .setSonarVersion("DEV")
     .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
     .setContext("/")
 
diff --git a/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java b/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
index b0f83bec168..7f765a62ec6 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
+++ b/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
@@ -19,6 +19,7 @@ public class IssueTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
     .build();
 }
diff --git a/it/it-tests/src/test/java/plugins/PluginsTest.java b/it/it-tests/src/test/java/plugins/PluginsTest.java
index 576f2aa27d5..5c5d9c85964 100644
--- a/it/it-tests/src/test/java/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/plugins/PluginsTest.java
@@ -74,6 +74,7 @@ public class PluginsTest {
     OrchestratorBuilder builder = Orchestrator.builderEnv();
 
     // install latest compatible releases of plugins
+    builder.setSonarVersion("DEV");
     org.sonar.updatecenter.common.Version sonarVersion = org.sonar.updatecenter.common.Version.create(builder.getSonarVersion());
     builder.getUpdateCenter().setInstalledSonarVersion(sonarVersion);
     for (Plugin plugin : builder.getUpdateCenter().findAllCompatiblePlugins()) {
diff --git a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
index c2f8450d7d2..9547f29be51 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
@@ -36,6 +36,7 @@ public class QualityGateNotificationTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
 
     // 1 second. Required for notification test.
diff --git a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java b/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
index 5f975e93a21..bcda5733949 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
@@ -30,6 +30,7 @@ public class QualityGateTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
 
     // 1 second. Required for notification test.
diff --git a/it/it-tests/src/test/java/server/HttpsTest.java b/it/it-tests/src/test/java/server/HttpsTest.java
index 4566ebd14c6..acf8d657555 100644
--- a/it/it-tests/src/test/java/server/HttpsTest.java
+++ b/it/it-tests/src/test/java/server/HttpsTest.java
@@ -69,6 +69,7 @@ public class HttpsTest {
     try {
       URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
       orchestrator = Orchestrator.builderEnv()
+        .setSonarVersion("DEV")
         .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
         .setServerProperty("sonar.web.https.keyAlias", "tests")
         .setServerProperty("sonar.web.https.keyPass", "__wrong__")
@@ -88,6 +89,7 @@ public class HttpsTest {
     // start server
     URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
     orchestrator = Orchestrator.builderEnv()
+      .setSonarVersion("DEV")
       .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
       .setServerProperty("sonar.web.https.keyAlias", "tests")
       .setServerProperty("sonar.web.https.keyPass", "thetests")
diff --git a/it/it-tests/src/test/java/server/ServerTest.java b/it/it-tests/src/test/java/server/ServerTest.java
index 23ac3c27c34..f490194ff2c 100644
--- a/it/it-tests/src/test/java/server/ServerTest.java
+++ b/it/it-tests/src/test/java/server/ServerTest.java
@@ -43,6 +43,7 @@ public class ServerTest {
   public void test_settings() {
     URL secretKeyUrl = getClass().getResource("/server/ServerTest/sonar-secret.txt");
     orchestrator = Orchestrator.builderEnv()
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("settings-plugin"))
       .addPlugin(ItUtils.pluginArtifact("license-plugin"))
       .setServerProperty("sonar.secretKeyPath", secretKeyUrl.getFile())
@@ -77,6 +78,7 @@ public class ServerTest {
   @Test
   public void property_relocation() {
     orchestrator = Orchestrator.builderEnv()
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("property-relocation-plugin"))
       .addPlugin(ItUtils.xooPlugin())
       .setServerProperty("sonar.deprecatedKey", "true")
@@ -103,6 +105,7 @@ public class ServerTest {
   public void check_minimal_sonar_version_at_startup() throws Exception {
     try {
       orchestrator = Orchestrator.builderEnv()
+        .setSonarVersion("DEV")
         .addPlugin(FileLocation.of(new File(ServerTest.class.getResource("/server/ServerTest/incompatible-plugin-1.0.jar").toURI())))
         .build();
       orchestrator.start();
@@ -117,7 +120,10 @@ public class ServerTest {
   public void support_install_dir_with_whitespaces() throws Exception {
     String dirName = "target/has space";
     FileUtils.deleteDirectory(new File(dirName));
-    orchestrator = Orchestrator.builderEnv().setOrchestratorProperty("orchestrator.workspaceDir", dirName).build();
+    orchestrator = Orchestrator.builderEnv()
+        .setSonarVersion("DEV")
+        .setOrchestratorProperty("orchestrator.workspaceDir", dirName)
+        .build();
     orchestrator.start();
 
     Server.Status status = orchestrator.getServer().getAdminWsClient().find(new ServerQuery()).getStatus();
@@ -128,6 +134,7 @@ public class ServerTest {
   @Test
   public void should_create_in_temp_folder() throws Exception {
     orchestrator = Orchestrator.builderEnv()
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("server-plugin"))
       .setServerProperty("sonar.createTempFiles", "true")
       .build();
@@ -155,7 +162,9 @@ public class ServerTest {
   public void restart_forbidden_if_not_dev_mode() throws Exception {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
-      orchestrator = Orchestrator.builderEnv().build();
+      orchestrator = Orchestrator.builderEnv()
+        .setSonarVersion("DEV")
+        .build();
       orchestrator.start();
       try {
         orchestrator.getServer().adminWsClient().systemClient().restart();
@@ -173,7 +182,10 @@ public class ServerTest {
   public void restart_on_dev_mode() throws Exception {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
-      orchestrator = Orchestrator.builderEnv().setServerProperty("sonar.web.dev", "true").build();
+      orchestrator = Orchestrator.builderEnv()
+        .setSonarVersion("DEV")
+        .setServerProperty("sonar.web.dev", "true")
+        .build();
       orchestrator.start();
 
       orchestrator.getServer().adminWsClient().systemClient().restart();
diff --git a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
index dd5897799cc..241e11ae5f9 100644
--- a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
+++ b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
@@ -36,6 +36,7 @@ public class ServerTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .addPlugin(ItUtils.xooPlugin())
 
     // Used in global_property_change_extension_point
diff --git a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
index d42907bfb85..8ac015a6bcf 100644
--- a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
+++ b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
@@ -22,6 +22,7 @@ public class UpdateCenterTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion("DEV")
     .setServerProperty("sonar.updatecenter.url", UpdateCenterTest.class.getResource("UpdateCenterTest/update-center.properties").toString())
     .addPlugin(pluginArtifact("sonar-fake-plugin"))
     .build();