diff options
Diffstat (limited to 'it/it-tests/src/test/java/server')
| -rw-r--r-- | it/it-tests/src/test/java/server/HttpsTest.java | 2 | ||||
| -rw-r--r-- | it/it-tests/src/test/java/server/ServerTest.java | 7 | ||||
| -rw-r--r-- | it/it-tests/src/test/java/server/suite/ServerTestSuite.java | 1 |
3 files changed, 0 insertions, 10 deletions
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 |