SONARPY-3824 Upgrade Orchestrator from 5.6.2.2625 to 6.1.0.3962 (#878)

GitOrigin-RevId: cba47518600d59675608747d48bd43a007eef7ff

Author: Seppli11

its/commons/src/test/java/com/sonar/python/it/ConcurrentOrchestratorExtension.java

@@ -25,7 +25,7 @@
 import com.sonar.orchestrator.locator.Locators;
 import com.sonar.orchestrator.server.StartupLogWatcher;
 import com.sonar.orchestrator.util.System2;
-import com.sonar.orchestrator.version.Version;
+import com.sonar.orchestrator.util.Version;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
@@ -66,9 +66,9 @@ private void prepareOrchestrator() {
   }
 
   private void installSonarScanner() {
-    Locators locators = getConfiguration().locators();
+    Locators locators = new Locators(getConfiguration());
     Version version = Version.create(SonarScanner.DEFAULT_SCANNER_VERSION);
-    new SonarScannerInstaller(locators).install(version, getConfiguration().fileSystem().workspace());
+    new SonarScannerInstaller(locators).install(version, getConfiguration().fileSystem().workspace().toFile());
   }
 
 

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/SonarLintIPythonTest.java

@@ -16,6 +16,7 @@
  */
 package com.sonar.python.it.plugin;
 
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.python.it.PluginLocator;
 import com.sonar.python.it.TestsUtils;
 import java.io.IOException;
@@ -82,8 +83,9 @@ public void log(String formattedMessage, Level level, @Nullable String stacktrac
       }
     };
     SonarLintLogger.setTarget(logOutput);
+    Locators locators = new Locators(TestsUtils.dynamicOrchestrator.getConfiguration());
     var pluginJarLocation = Set
-      .of(TestsUtils.dynamicOrchestrator.getConfiguration().locators().locate(PluginLocator.Plugins.PYTHON.get(PluginLocator.isEnterpriseTest())).toPath());
+      .of(locators.locate(PluginLocator.Plugins.PYTHON.get(PluginLocator.isEnterpriseTest())).toPath());
     var enabledLanguages = Set.of(SonarLanguage.IPYTHON);
     var pluginConfiguration = new PluginsLoader.Configuration(pluginJarLocation, enabledLanguages, false, Optional.empty());
     var pluginLoader = new PluginsLoader().load(pluginConfiguration, Set.of());

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/SonarLintTest.java

@@ -16,6 +16,7 @@
  */
 package com.sonar.python.it.plugin;
 
+import com.sonar.orchestrator.locator.Locators;
 import com.sonar.python.it.PluginLocator;
 import com.sonar.python.it.TestsUtils;
 import java.io.File;
@@ -84,8 +85,9 @@ public void log(String formattedMessage, Level level, @Nullable String stacktrac
       }
     };
     SonarLintLogger.setTarget(logOutput);
+    Locators locators = new Locators(TestsUtils.dynamicOrchestrator.getConfiguration());
     var pluginJarLocation = Set
-      .of(TestsUtils.dynamicOrchestrator.getConfiguration().locators().locate(PluginLocator.Plugins.PYTHON.get(PluginLocator.isEnterpriseTest())).toPath());
+      .of(locators.locate(PluginLocator.Plugins.PYTHON.get(PluginLocator.isEnterpriseTest())).toPath());
     var enabledLanguages = Set.of(SonarLanguage.PYTHON);
     var pluginConfiguration = new PluginsLoader.Configuration(pluginJarLocation, enabledLanguages, false, Optional.empty());
     var pluginLoader = new PluginsLoader().load(pluginConfiguration, Set.of());

override-dep-licenses.properties

@@ -1,7 +1,7 @@
 # Override license defined in parent POM
 # See check-license-compatibility.sh
-
 com.google.code.gson--gson--2.11.0=apache_v2
 commons-io--commons-io--2.17.0=apache_v2
 com.github.spotbugs=apache_v2
 info.picocli--picocli--4.7.5=apache_v2
+org.codehaus.woodstox--stax2-api--4.2.2=bsd

pom.xml

@@ -102,7 +102,7 @@
     <sonar.projectName>Python Enterprise</sonar.projectName>
     <sonar.version>26.2.0.119303</sonar.version>
     <sonar.api.version>13.0.0.3026</sonar.api.version>
-    <sonar.orchestrator.version>5.6.2.2625</sonar.orchestrator.version>
+    <sonar.orchestrator.version>6.1.0.3962</sonar.orchestrator.version>
     <sonar-analyzer-commons.version>2.21.0.4626</sonar-analyzer-commons.version>
     <sonar.sca.exclusions>
       its/**,private/its-enterprise/**,python-frontend/typeshed_serializer/**,**/test/resources/**