Upgrade to Orchestrator 3.11

Fixes some FP with download of plugins

diff --git a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
index 9f6e3c0e2b3cd14256aed7f2337e4718738ab186..5817eed3030855967730a2693c153c7dc4ae3205 100644 (file)
--- a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
+++ b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
@@ -48,7 +48,6 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -379,7 +378,7 @@ public class IssuesModeTest {
   private void runConcurrentIssues(final String workDirPath) throws Exception {
     // Install sonar-runner in advance to avoid concurrent unzip issues
     FileSystem fileSystem = orchestrator.getConfiguration().fileSystem();
-    new SonarScannerInstaller(fileSystem).install(Version.create(SonarScanner.DEFAULT_RUNNER_VERSION), fileSystem.workspace());
+    new SonarScannerInstaller(fileSystem).install(Version.create(SonarScanner.DEFAULT_SCANNER_VERSION), fileSystem.workspace(), true);
     final int nThreads = 3;
     ExecutorService executorService = Executors.newFixedThreadPool(nThreads);
     List<Callable<BuildResult>> tasks = new ArrayList<>();

diff --git a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
index 393726736bec6dfa241848c0173b644b0dcc2fb9..29c666d0433fca0b88ddf70a4cb99c4c75293be0 100644 (file)
--- a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
+++ b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
@@ -19,13 +19,13 @@
  */
 package it.duplication;
 
+import com.google.common.collect.ObjectArrays;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.selenium.Selenese;
 import it.Category4Suite;
 import java.util.List;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -151,13 +151,13 @@ public class CrossProjectDuplicationsTest {
 
   private static void executeAnalysis(String projectKey, String path, String... additionalProperties) {
     runProjectAnalysis(orchestrator, path,
-      ArrayUtils.addAll(
+      ObjectArrays.concat(
         new String[] {
           "sonar.cpd.cross_project", "true",
           "sonar.projectKey", projectKey,
           "sonar.projectName", projectKey
         },
-        additionalProperties));
+        additionalProperties, String.class));
   }
 
   private static int getMeasure(String projectKey, String metricKey) {

diff --git a/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java b/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
index 688cffd5d903e4b8a292b482bda35e56d99cb431..44d7c42ca967ab1c40154578eb34baa4429aa539 100644 (file)
--- a/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
+++ b/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
@@ -19,13 +19,13 @@
  */
 package it.duplication;
 
+import com.google.common.collect.ObjectArrays;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.selenium.Selenese;
 import it.Category4Suite;
 import java.util.List;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -140,7 +140,7 @@ public class DuplicationsTest {
       Selenese.builder().setHtmlTestsInClasspath("duplications_widget",
         // SONAR-4347
         "/duplication/DuplicationsTest/duplications_widget.html").build())
-    .runOn(orchestrator);
+      .runOn(orchestrator);
   }
 
   private static Resource getComponent(String key) {
@@ -163,12 +163,12 @@ public class DuplicationsTest {
     orchestrator.getServer().associateProjectToQualityProfile(projectKey, "xoo", "xoo-duplication-profile");
 
     runProjectAnalysis(orchestrator, "duplications/file-duplications",
-      ArrayUtils.addAll(
+      ObjectArrays.concat(
         new String[] {
           "sonar.projectKey", projectKey,
           "sonar.projectName", projectKey
         },
-        additionalProperties));
+        additionalProperties, String.class));
   }
 
   private static void verifyWsResultOnDuplicateFile(String fileKey, String ws, String expectedFilePath) throws Exception {

diff --git a/pom.xml b/pom.xml
index d248f5c9442c1e7493ab41cb1d96342bb9d07226..a31e5951ec7ef3c40336b46eca5741872d4dd39c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <slf4j.version>1.7.12</slf4j.version>
     <tomcat.version>8.0.30</tomcat.version>
     <elasticsearch.version>1.7.5</elasticsearch.version>
-    <orchestrator.version>3.11-build315</orchestrator.version>
+    <orchestrator.version>3.11</orchestrator.version>
     <okhttp.version>2.6.0</okhttp.version>
 
     <protobuf.version>3.0.0-beta-2</protobuf.version>