Automatic merge from branch-5.1

* origin/branch-5.2:
  Fix configuration of SQ version
  Revert "Fix the bad SQ version used by integration tests"
  Fix the bad SQ version used by integration tests

12 files changed, 1 insertions, 19 deletions

diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index 570dd0ca1ed..07b81d1e915 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -14,7 +14,6 @@
   <properties>
     <category1>*</category1>
     <category2>NONE</category2>
-    <surefire.argLine>-Xmx128m -server</surefire.argLine>
     <skipIts>false</skipIts>
   </properties>
 
@@ -107,6 +106,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <argLine>-Xmx128m -Dsonar.runtimeVersion=${project.version}</argLine>
           <skipTests>${skipIts}</skipTests>
           <includes>
             <include>${category1}/suite/*TestSuite.java</include>
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 8ffd47fe53d..6eca10ab2bd 100644
--- a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
+++ b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
@@ -45,7 +45,6 @@ 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 396e03981cb..d0ee8260910 100644
--- a/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
+++ b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
@@ -52,7 +52,6 @@ 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/suite/BatchTestSuite.java b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
index 7a5aa4028a0..eccc74a4868 100644
--- a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
+++ b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
@@ -22,7 +22,6 @@ 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 3e6a1e4ce02..76fa94b15e1 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
+++ b/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
@@ -27,7 +27,6 @@ public class IssueTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setSonarVersion("DEV")
     .addPlugin(xooPlugin())
     .addPlugin(pluginArtifact("issue-action-plugin"))
     .build();
diff --git a/it/it-tests/src/test/java/plugins/PluginsTest.java b/it/it-tests/src/test/java/plugins/PluginsTest.java
index 5c5d9c85964..576f2aa27d5 100644
--- a/it/it-tests/src/test/java/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/plugins/PluginsTest.java
@@ -74,7 +74,6 @@ 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 9547f29be51..c2f8450d7d2 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
@@ -36,7 +36,6 @@ 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 bcda5733949..5f975e93a21 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
@@ -30,7 +30,6 @@ 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 acf8d657555..4566ebd14c6 100644
--- a/it/it-tests/src/test/java/server/HttpsTest.java
+++ b/it/it-tests/src/test/java/server/HttpsTest.java
@@ -69,7 +69,6 @@ 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__")
@@ -89,7 +88,6 @@ 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 f490194ff2c..95a2956ed97 100644
--- a/it/it-tests/src/test/java/server/ServerTest.java
+++ b/it/it-tests/src/test/java/server/ServerTest.java
@@ -43,7 +43,6 @@ 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())
@@ -78,7 +77,6 @@ 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")
@@ -105,7 +103,6 @@ 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();
@@ -121,7 +118,6 @@ public class ServerTest {
     String dirName = "target/has space";
     FileUtils.deleteDirectory(new File(dirName));
     orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion("DEV")
         .setOrchestratorProperty("orchestrator.workspaceDir", dirName)
         .build();
     orchestrator.start();
@@ -134,7 +130,6 @@ 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();
@@ -163,7 +158,6 @@ public class ServerTest {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion("DEV")
         .build();
       orchestrator.start();
       try {
@@ -183,7 +177,6 @@ public class ServerTest {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion("DEV")
         .setServerProperty("sonar.web.dev", "true")
         .build();
       orchestrator.start();
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 241e11ae5f9..dd5897799cc 100644
--- a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
+++ b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
@@ -36,7 +36,6 @@ 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 8ac015a6bcf..d42907bfb85 100644
--- a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
+++ b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
@@ -22,7 +22,6 @@ 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();