SQSCANNER-78 - backtick syntax (#83)

2 files changed, 22 insertions, 6 deletions

diff --git a/it/pom.xml b/it/pom.xml
index 633f93c..430a58b 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.29.0.2543</version>
+      <version>3.30.0.2630</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
index 5d76042..bc795b2 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
@@ -20,6 +20,7 @@
 package com.sonarsource.scanner.it;
 
 import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.locator.MavenLocation;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -27,17 +28,32 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ScannerTest.class, MultimoduleTest.class, DistributionTest.class})
+@SuiteClasses({ScannerTest.class, MultimoduleTest.class,
+                DistributionTest.class})
 public class SonarScannerTestSuite {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE[6.7]"))
+  public static final Orchestrator ORCHESTRATOR = createOrchestrator();
+
+  private static Orchestrator createOrchestrator() {
+    String sonarVersion = System
+      .getProperty("sonar.runtimeVersion", "LATEST_RELEASE[6.7]");
+    OrchestratorBuilder builder = Orchestrator.builderEnv()
+      .setSonarVersion(
+        sonarVersion);
     // The scanner cli should still be compatible with previous LTS 6.7, and not the 7.9
     // at the time of writing, so the installed plugins should be compatible with
     // both 6.7 and 8.x. The latest releases of analysers drop the compatibility with
     // 6.7, that's why versions are hardcoded here.
-    .addPlugin(MavenLocation.of("org.sonarsource.javascript", "sonar-javascript-plugin", "5.2.1.7778"))
-    .build();
+    MavenLocation javascriptPlugin = MavenLocation
+      .of("org.sonarsource.javascript", "sonar-javascript-plugin",
+        "5.2.1.7778");
+    if (sonarVersion.startsWith("DEV")) {
+      builder.addBundledPlugin(javascriptPlugin);
+    } else {
+      builder.addPlugin(javascriptPlugin);
+    }
+    return builder.build();
+  }
 
 }