Revert "Fix the bad SQ version used by integration tests"

This reverts commit 2d67d61504c354f3ebe5d9bedc54d66b1122bd75.

12 files changed, 19 insertions, 19 deletions

diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index ebd709a6b40..64fa4ec6820 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <category1>*</category1>
     <category2>NONE</category2>
-    <surefire.argLine>-Xmx128m -server -Dsonar.runtimeVersion=${pom.version}</surefire.argLine>
+    <surefire.argLine>-Xmx128m -server</surefire.argLine>
     <skipIts>false</skipIts>
   </properties>
 
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 045ea7efd19..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,7 +45,7 @@ public class AdministrationTestSuite {
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .setServerProperty("sonar.notifications.delay", "1")
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 2589bada8da..396e03981cb 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,7 @@ public class AnalysisTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 77a6f3f2b0e..7a5aa4028a0 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,7 @@ public class BatchTestSuite {
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .addPlugin(ItUtils.xooPlugin())
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 eed11388ae8..3e6a1e4ce02 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,7 @@ public class IssueTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 cf41b0dd100..5c5d9c85964 100644
--- a/it/it-tests/src/test/java/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/plugins/PluginsTest.java
@@ -74,7 +74,7 @@ public class PluginsTest {
     OrchestratorBuilder builder = Orchestrator.builderEnv();
 
     // install latest compatible releases of plugins
-    builder.setSonarVersion(System.getProperty("sonar.runtimeVersion")));
+    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 5a4850f9a52..9547f29be51 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
@@ -36,7 +36,7 @@ public class QualityGateNotificationTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 4a624ac07e1..bcda5733949 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
+++ b/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
@@ -30,7 +30,7 @@ public class QualityGateTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 6b67b4ba1e9..acf8d657555 100644
--- a/it/it-tests/src/test/java/server/HttpsTest.java
+++ b/it/it-tests/src/test/java/server/HttpsTest.java
@@ -69,7 +69,7 @@ public class HttpsTest {
     try {
       URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+        .setSonarVersion("DEV")
         .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
         .setServerProperty("sonar.web.https.keyAlias", "tests")
         .setServerProperty("sonar.web.https.keyPass", "__wrong__")
@@ -89,7 +89,7 @@ public class HttpsTest {
     // start server
     URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
     orchestrator = Orchestrator.builderEnv()
-      .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+      .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 b951250dc75..f490194ff2c 100644
--- a/it/it-tests/src/test/java/server/ServerTest.java
+++ b/it/it-tests/src/test/java/server/ServerTest.java
@@ -43,7 +43,7 @@ public class ServerTest {
   public void test_settings() {
     URL secretKeyUrl = getClass().getResource("/server/ServerTest/sonar-secret.txt");
     orchestrator = Orchestrator.builderEnv()
-      .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("settings-plugin"))
       .addPlugin(ItUtils.pluginArtifact("license-plugin"))
       .setServerProperty("sonar.secretKeyPath", secretKeyUrl.getFile())
@@ -78,7 +78,7 @@ public class ServerTest {
   @Test
   public void property_relocation() {
     orchestrator = Orchestrator.builderEnv()
-      .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("property-relocation-plugin"))
       .addPlugin(ItUtils.xooPlugin())
       .setServerProperty("sonar.deprecatedKey", "true")
@@ -105,7 +105,7 @@ public class ServerTest {
   public void check_minimal_sonar_version_at_startup() throws Exception {
     try {
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+        .setSonarVersion("DEV")
         .addPlugin(FileLocation.of(new File(ServerTest.class.getResource("/server/ServerTest/incompatible-plugin-1.0.jar").toURI())))
         .build();
       orchestrator.start();
@@ -121,7 +121,7 @@ public class ServerTest {
     String dirName = "target/has space";
     FileUtils.deleteDirectory(new File(dirName));
     orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+        .setSonarVersion("DEV")
         .setOrchestratorProperty("orchestrator.workspaceDir", dirName)
         .build();
     orchestrator.start();
@@ -134,7 +134,7 @@ public class ServerTest {
   @Test
   public void should_create_in_temp_folder() throws Exception {
     orchestrator = Orchestrator.builderEnv()
-      .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+      .setSonarVersion("DEV")
       .addPlugin(ItUtils.pluginArtifact("server-plugin"))
       .setServerProperty("sonar.createTempFiles", "true")
       .build();
@@ -163,7 +163,7 @@ public class ServerTest {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+        .setSonarVersion("DEV")
         .build();
       orchestrator.start();
       try {
@@ -183,7 +183,7 @@ public class ServerTest {
     // server classloader locks Jar files on Windows
     if (!SystemUtils.IS_OS_WINDOWS) {
       orchestrator = Orchestrator.builderEnv()
-        .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+        .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 a82983f38ea..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,7 +36,7 @@ public class ServerTestSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .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 0f627c045e6..8ac015a6bcf 100644
--- a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
+++ b/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
@@ -22,7 +22,7 @@ public class UpdateCenterTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion"))
+    .setSonarVersion("DEV")
     .setServerProperty("sonar.updatecenter.url", UpdateCenterTest.class.getResource("UpdateCenterTest/update-center.properties").toString())
     .addPlugin(pluginArtifact("sonar-fake-plugin"))
     .build();