(WIP)

Author: Godin

build.gradle.kts

@@ -155,6 +155,7 @@ subprojects {
                 (it.startsWith("orchestrator") || it.startsWith("sonar") || it == "buildNumber" || it == "slangVersion")
         }.mapKeys { it.key as String }
 
+        // TODO remove:
         if (systemProperties.containsKey("buildNumber") && !systemProperties.containsKey("slangVersion")) {
             systemProperties["slangVersion"] = version
         }

its/plugin/src/test/java/org/sonarsource/slang/TestsHelper.java

@@ -52,19 +52,10 @@ public class TestsHelper {
   }
 
   static void addLanguagePlugins(OrchestratorBuilder builder) {
-    String slangVersion = System.getProperty("slangVersion");
-
     LANGUAGES.forEach(language -> {
       Location pluginLocation;
       String plugin = "sonar-" + language +"-plugin";
-      if (slangVersion == null || slangVersion.isEmpty()) {
-        // use the plugin that was built on local machine
-        pluginLocation = FileLocation.byWildcardMavenFilename(new File("../../" + plugin + "/build/libs"), plugin + ".jar");
-      } else {
-        // QA environment downloads the plugin built by the CI job
-        pluginLocation = MavenLocation.of("org.sonarsource.kotlin", plugin, slangVersion);
-      }
-
+      pluginLocation = FileLocation.byWildcardMavenFilename(new File("../../" + plugin + "/build/libs"), plugin + ".jar");
       builder.addPlugin(pluginLocation);
     });
   }

its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java

@@ -83,19 +83,10 @@ public static void setUp() {
   }
 
   private static void addLanguagePlugins(OrchestratorBuilder builder) {
-    String slangVersion = System.getProperty("slangVersion");
-
     LANGUAGES.forEach(language -> {
       Location pluginLocation;
       String plugin = "sonar-" + language +"-plugin";
-      if (slangVersion == null || slangVersion.isEmpty()) {
-        // use the plugin that was built on local machine
-        pluginLocation = FileLocation.byWildcardMavenFilename(new File("../../" + plugin + "/build/libs"), plugin + ".jar");
-      } else {
-        // QA environment downloads the plugin built by the CI job
-        pluginLocation = MavenLocation.of("org.sonarsource.kotlin", plugin, slangVersion);
-      }
-
+      pluginLocation = FileLocation.byWildcardMavenFilename(new File("../../" + plugin + "/build/libs"), plugin + ".jar");
       builder.addPlugin(pluginLocation);
     });
   }