Update orchestrator to 6.1.0.3962

Author: tomasz-tylenda-sonarsource

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaClasspathTest.java

@@ -20,6 +20,7 @@
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.nio.file.Path;
@@ -67,7 +68,7 @@ public void copyGuavaJar() {
     File subFolder = new File(tmp.getRoot(), "subFolder");
     // Use a folder with comma to test proper property parsing
     File subSubFolder = new File(subFolder, "sub,SubFolder");
-    ORCHESTRATOR.getConfiguration().locators().copyToDirectory(guava, subSubFolder);
+    new Locators(ORCHESTRATOR.getConfiguration()).copyToDirectory(guava, subSubFolder);
 
     aarPath = new File(new File(TestUtils.projectDir("using-aar-dep"), "lib"), "cache-1.3.0.aar").getAbsolutePath();
     guavaJarPathEscaped = "\"" + new File(subSubFolder.getAbsolutePath(), guava.getFilename()).getAbsolutePath() + "\"";

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java

@@ -20,6 +20,7 @@
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.junit4.OrchestratorRule;
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.orchestrator.locator.MavenLocation;
 import java.io.File;
 import java.util.List;
@@ -154,7 +155,7 @@ public void support_change_of_extension_property() {
   @Test
   public void should_execute_rule_on_test() {
     MavenLocation junit411 = MavenLocation.of("junit", "junit", "4.11");
-    orchestrator.getConfiguration().locators().copyToDirectory(junit411, tmp.getRoot());
+    new Locators(orchestrator.getConfiguration()).copyToDirectory(junit411, tmp.getRoot());
     MavenBuild build = TestUtils.createMavenBuild()
       .setPom(TestUtils.projectPom("java-inner-classes"))
       .setProperty("sonar.java.test.binaries", "target/test-classes")

pom.xml

@@ -97,7 +97,7 @@
     <sonarlint.plugin.api.version>10.13.0.79996</sonarlint.plugin.api.version>
     <sonar.sca.exclusions>its/**,java-checks-test-sources/**</sonar.sca.exclusions>
     <analyzer.commons.version>2.18.0.3393</analyzer.commons.version>
-    <orchestrator.version>5.6.2.2625</orchestrator.version>
+    <orchestrator.version>6.1.0.3962</orchestrator.version>
     <sslr.version>1.24.0.633</sslr.version>
     <argLine>-Xmx512m</argLine>
     <gitRepositoryName>sonar-java</gitRepositoryName>