Upgrade Orchestrator

Author: ehartmann

.cix.yml

@@ -3,7 +3,7 @@
 
 SQ_VERSION:
   - DEV
-  - LTS
+  - LATEST_RELEASE[6.7]
   - LATEST_RELEASE
 
 JAVA_VERSION:

.gitignore

@@ -28,3 +28,6 @@ Icon?
 Thumbs.db 
 # Folder config file
 Desktop.ini
+
+# Scanner work
+.scannerwork

its/it-tests/pom.xml

@@ -18,10 +18,16 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.14.0.887</version>
+      <version>3.22.0.1751</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

its/it-tests/src/test/java/com/sonar/scanner/api/it/ProxyTest.java

@@ -25,6 +25,7 @@
 import com.sonar.scanner.api.it.tools.ProxyAuthenticator;
 import com.sonar.scanner.api.it.tools.SimpleScanner;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -84,7 +85,7 @@ public void stopProxy() throws Exception {
   }
 
   private static void startProxy(boolean needProxyAuth) throws Exception {
-    httpProxyPort = NetworkUtils.getNextAvailablePort();
+    httpProxyPort = NetworkUtils.getNextAvailablePort(InetAddress.getLocalHost());
 
     // Setup Threadpool
     QueuedThreadPool threadPool = new QueuedThreadPool();
@@ -211,7 +212,7 @@ public void simple_analysis_with_proxy_auth() throws Exception {
     params.put("http.proxyPassword", PROXY_PASSWORD);
     buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(seenByProxy).isNotEmpty();
-    if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals("6.1")) {
+    if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals(6, 1)) {
       assertThat(buildResult.getLastStatus()).isEqualTo(0);
     }
   }

its/it-tests/src/test/java/com/sonar/scanner/api/it/SSLTest.java

@@ -23,6 +23,7 @@
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.util.NetworkUtils;
 import com.sonar.scanner.api.it.tools.SimpleScanner;
+import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -82,8 +83,8 @@ public void stopProxy() throws Exception {
   }
 
   private static void startSSLTransparentReverseProxy(boolean requireClientAuth) throws Exception {
-    int httpPort = NetworkUtils.getNextAvailablePort();
-    httpsPort = NetworkUtils.getNextAvailablePort();
+    int httpPort = NetworkUtils.getNextAvailablePort(InetAddress.getLocalHost());
+    httpsPort = NetworkUtils.getNextAvailablePort(InetAddress.getLocalHost());
 
     // Setup Threadpool
     QueuedThreadPool threadPool = new QueuedThreadPool();
@@ -203,5 +204,4 @@ public void simple_analysis_with_server_certificate() throws Exception {
     buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort, params);
     assertThat(buildResult.getLastStatus()).isEqualTo(0);
   }
-
 }

its/it-tests/src/test/java/com/sonar/scanner/api/it/ScannerApiTestSuite.java

@@ -20,19 +20,32 @@
 package com.sonar.scanner.api.it;
 
 import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.locator.MavenLocation;
+import org.apache.commons.lang.StringUtils;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import static org.assertj.core.api.Assertions.fail;
+
 @RunWith(Suite.class)
 @SuiteClasses({ProxyTest.class, SSLTest.class, PropertiesTest.class})
 public class ScannerApiTestSuite {
+  private static final String SONAR_RUNTIME_VERSION = "sonar.runtimeVersion";
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setOrchestratorProperty("javascriptVersion", "LATEST_RELEASE")
-    .addPlugin("javascript")
+    .setSonarVersion(getSystemPropertyOrFail(SONAR_RUNTIME_VERSION))
+    .addPlugin(MavenLocation.of("org.sonarsource.javascript", "sonar-javascript-plugin", "LATEST_RELEASE"))
     .build();
 
+  private static String getSystemPropertyOrFail(String orchestratorPropertiesSource) {
+    String propertyValue = System.getProperty(orchestratorPropertiesSource);
+    if (StringUtils.isEmpty(propertyValue)) {
+      fail(orchestratorPropertiesSource + " system property must be defined");
+    }
+    return propertyValue;
+  }
+
 }

its/it-tests/src/test/java/com/sonar/scanner/api/it/tools/CommandExecutor.java

@@ -19,17 +19,6 @@
  */
 package com.sonar.scanner.api.it.tools;
 
-import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.ExecuteStreamHandler;
-import org.apache.commons.exec.ExecuteWatchdog;
-import org.apache.commons.exec.PumpStreamHandler;
-import org.apache.commons.io.output.TeeOutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,6 +33,15 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nullable;
+import org.apache.commons.exec.CommandLine;
+import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.exec.ExecuteStreamHandler;
+import org.apache.commons.exec.ExecuteWatchdog;
+import org.apache.commons.exec.PumpStreamHandler;
+import org.apache.commons.io.output.TeeOutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CommandExecutor {
   private static final Logger LOG = LoggerFactory.getLogger(CommandExecutor.class);
@@ -68,7 +66,7 @@ public int execute(String[] args, Map<String, String> env) throws IOException {
 
   public int execute(String[] args, Map<String, String> env, @Nullable Path workingDir) throws IOException {
     if (!Files.isExecutable(file)) {
-      Set<PosixFilePermission> perms = new HashSet<PosixFilePermission>();
+      Set<PosixFilePermission> perms = new HashSet<>();
       perms.add(PosixFilePermission.OWNER_READ);
       perms.add(PosixFilePermission.OWNER_EXECUTE);
       Files.setPosixFilePermissions(file, perms);