From: Jacek <jacek.poreda@sonarsource.com>
Date: Mon, 23 Nov 2020 19:51:55 +0000 (+0100)
Subject: Update orchestrator version to 3.34
X-Git-Tag: 8.6.0.39681~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8ec651e57d21bacfe7bfdd32f2f6a79ad1d5359;p=sonarqube.git

Update orchestrator version to 3.34

By default this version is disabling force authentication for 8.6 and greater.
Also it allows to enable default behaviour, which will be used.
---

diff --git a/build.gradle b/build.gradle
index 6beb1293b26..767692f9a90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -368,7 +368,7 @@ subprojects {
       dependency 'org.postgresql:postgresql:42.2.17'
       dependency 'org.reflections:reflections:0.9.12'
       dependency 'org.simpleframework:simple:4.1.21'
-      dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.32.0.2670'
+      dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.34.0.2692'
       dependency 'org.sonarsource.update-center:sonar-update-center-common:1.23.0.723'
       dependency 'org.subethamail:subethasmtp:3.1.7'
       dependency 'org.yaml:snakeyaml:1.26'
diff --git a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
index 4659f739206..b68d2f6077c 100644
--- a/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
+++ b/sonar-ws-generator/src/main/java/org/sonarqube/wsgenerator/ApiDefinitionDownloader.java
@@ -35,7 +35,8 @@ public class ApiDefinitionDownloader {
   }
 
   public static String downloadApiDefinition() {
-    OrchestratorBuilder builder = Orchestrator.builderEnv();
+    OrchestratorBuilder builder = Orchestrator.builderEnv()
+      .defaultForceAuthentication();
     builder.setEdition(COMMUNITY);
     builder.setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile())
       .setOrchestratorProperty("orchestrator.workspaceDir", "build");