(WIP) use Orchestrator 5.6.2.2625

Author: Godin

its/plugin/pom.xml

@@ -25,7 +25,7 @@
   <dependencies>
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
+      <artifactId>sonar-orchestrator-junit4</artifactId>
       <version>${orchestrator.version}</version>
       <scope>test</scope>
     </dependency>

its/plugin/src/test/java/com/sonar/it/flex/CoverageTest.java

@@ -16,8 +16,8 @@
  */
 package com.sonar.it.flex;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import java.io.File;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -28,7 +28,7 @@
 public class CoverageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Tests.ORCHESTRATOR;
+  public static OrchestratorRule orchestrator = Tests.ORCHESTRATOR;
 
   private static final String REPORT_PATH = "reports/coverage/coverage.xml";
   private static final String REPORT_PATH2 = "reports/coverage/coverage2.xml";

its/plugin/src/test/java/com/sonar/it/flex/FlexIntegrationTest.java

@@ -16,8 +16,8 @@
  */
 package com.sonar.it.flex;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import java.io.File;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -33,7 +33,7 @@
 public class FlexIntegrationTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Tests.ORCHESTRATOR;
+  public static OrchestratorRule orchestrator = Tests.ORCHESTRATOR;
 
   private static final String PROJECT_AS3COMMONS = "org.as3commons:as3commons-project";
   private static final String MODULE_COMMONS_LANG = "org.as3commons:as3commons-lang";

its/plugin/src/test/java/com/sonar/it/flex/FlexSimpleProjectTest.java

@@ -16,8 +16,8 @@
  */
 package com.sonar.it.flex;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import java.io.File;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -35,7 +35,7 @@ public class FlexSimpleProjectTest {
   private static final String PROJECT = "simple-project";
 
   @ClassRule
-  public static Orchestrator orchestrator = Tests.ORCHESTRATOR;
+  public static OrchestratorRule orchestrator = Tests.ORCHESTRATOR;
 
   private static String keyFor(String s) {
     return PROJECT + ":src/" + s;

its/plugin/src/test/java/com/sonar/it/flex/Tests.java

@@ -16,10 +16,10 @@
  */
 package com.sonar.it.flex;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.config.Configuration;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.locator.FileLocation;
 import java.io.File;
 import java.util.Collections;
@@ -46,7 +46,7 @@
 public class Tests {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+  public static final OrchestratorRule ORCHESTRATOR = OrchestratorRule.builderEnv()
     .useDefaultAdminCredentialsForBuilds(true)
     .setSonarVersion(Configuration.createEnv().getString("sonar.runtimeVersion"))
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../sonar-flex-plugin/target"), "sonar-flex-plugin-*.jar"))

its/ruling/pom.xml

@@ -21,7 +21,7 @@
   <dependencies>
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
+      <artifactId>sonar-orchestrator-junit4</artifactId>
       <version>${orchestrator.version}</version>
       <scope>test</scope>
     </dependency>

its/ruling/src/test/java/org/sonar/flex/it/FlexRulingTest.java

@@ -16,9 +16,9 @@
  */
 package org.sonar.flex.it;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.config.Configuration;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
@@ -31,7 +31,7 @@
 public class FlexRulingTest {
 
   @ClassRule
-  public static Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+  public static OrchestratorRule ORCHESTRATOR = OrchestratorRule.builderEnv()
     .useDefaultAdminCredentialsForBuilds(true)
     .setSonarVersion(Configuration.createEnv().getString("sonar.runtimeVersion"))
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../sonar-flex-plugin/target"), "sonar-flex-plugin-*.jar"))

pom.xml

@@ -80,7 +80,7 @@
     <analyzerCommons.version>2.7.0.1482</analyzerCommons.version>
     <junit.version>4.13.2</junit.version>
     <fest.version>1.4</fest.version>
-    <orchestrator.version>3.40.0.183</orchestrator.version>
+    <orchestrator.version>5.6.2.2625</orchestrator.version>
 
     <gitRepositoryName>sonar-flex</gitRepositoryName>