[NO-JIRA] Update orchestrator to 3.40.0.183

Author: alain-kermis-sonarsource

its/it-tests/pom.xml

@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.38.0.115</version>
+      <version>3.40.0.183</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

its/it-tests/src/test/java/com/sonar/scanner/api/it/ProxyTest.java

@@ -182,7 +182,7 @@ public void simple_analysis_with_proxy_no_auth() throws Exception {
 
     // Don't use proxy
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl());
-    assertThat(buildResult.getLastStatus()).isEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isZero();
     assertThat(seenByProxy).isEmpty();
 
     Map<String, String> params = new HashMap<>();
@@ -192,7 +192,7 @@ public void simple_analysis_with_proxy_no_auth() throws Exception {
     params.put("http.proxyPort", "" + httpProxyPort);
 
     buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
-    assertThat(buildResult.getLastStatus()).isEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isZero();
     assertThat(seenByProxy).isNotEmpty();
   }
 
@@ -217,7 +217,7 @@ public void simple_analysis_with_proxy_auth() throws Exception {
     buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), params);
     assertThat(seenByProxy).isNotEmpty();
     if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals(6, 1)) {
-      assertThat(buildResult.getLastStatus()).isEqualTo(0);
+      assertThat(buildResult.getLastStatus()).isZero();
     }
   }
 

its/it-tests/src/test/java/com/sonar/scanner/api/it/SSLTest.java

@@ -168,7 +168,7 @@ public void simple_analysis_with_server_and_client_certificate() throws Exceptio
     SimpleScanner scanner = new SimpleScanner();
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
 
-    assertThat(buildResult.getLastStatus()).isNotEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isNotZero();
     assertThat(buildResult.getLogs()).contains("javax.net.ssl.SSLHandshakeException");
 
     Path clientTruststore = Paths.get(SSLTest.class.getResource(KEYSTORE_CLIENT_WITH_CA).toURI()).toAbsolutePath();
@@ -185,7 +185,7 @@ public void simple_analysis_with_server_and_client_certificate() throws Exceptio
     params.put("javax.net.ssl.keyStorePassword", CLIENT_KEYSTORE_PASSWORD);
 
     buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort, params);
-    assertThat(buildResult.getLastStatus()).isEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isZero();
   }
 
   @Test
@@ -194,7 +194,7 @@ public void simple_analysis_with_server_and_without_client_certificate_is_failin
     SimpleScanner scanner = new SimpleScanner();
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
 
-    assertThat(buildResult.getLastStatus()).isNotEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isNotZero();
     assertThat(buildResult.getLogs()).contains("javax.net.ssl.SSLHandshakeException");
 
     Path clientTruststore = Paths.get(SSLTest.class.getResource(KEYSTORE_CLIENT_WITH_CA).toURI()).toAbsolutePath();
@@ -247,7 +247,7 @@ private void simple_analysis_with_server_certificate(String clientTrustStore, St
     SimpleScanner scanner = new SimpleScanner();
 
     BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
-    assertThat(buildResult.getLastStatus()).isNotEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isNotZero();
     assertThat(buildResult.getLogs()).contains("javax.net.ssl.SSLHandshakeException");
 
     Path clientTruststore = Paths.get(SSLTest.class.getResource(clientTrustStore).toURI()).toAbsolutePath();
@@ -258,6 +258,6 @@ private void simple_analysis_with_server_certificate(String clientTrustStore, St
     params.put("javax.net.ssl.trustStorePassword", keyStorePassword);
 
     buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort, params);
-    assertThat(buildResult.getLastStatus()).isEqualTo(0);
+    assertThat(buildResult.getLastStatus()).isZero();
   }
 }

its/it-tests/src/test/java/com/sonar/scanner/api/it/ScannerApiTestSuite.java

@@ -25,7 +25,6 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import org.apache.commons.lang.StringUtils;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -42,6 +41,7 @@ public class ScannerApiTestSuite {
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
     .setSonarVersion(getSystemPropertyOrFail(SONAR_RUNTIME_VERSION))
+    .useDefaultAdminCredentialsForBuilds(true)
     // The scanner api should still be compatible with 7.9
     .addPlugin(MavenLocation.of("org.sonarsource.javascript", "sonar-javascript-plugin", "7.0.1.14561"))
     .build();

its/it-tests/src/test/java/com/sonar/scanner/api/it/tools/SimpleScanner.java

@@ -19,6 +19,7 @@
  */
 package com.sonar.scanner.api.it.tools;
 
+import com.sonar.scanner.api.it.ScannerApiTestSuite;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -76,6 +77,7 @@ private Map<String, String> getSimpleProjectProperties(Path baseDir, String host
     analysisProperties.load(Files.newInputStream(propertiesFile));
     analysisProperties.setProperty("sonar.projectBaseDir", baseDir.toAbsolutePath().toString());
     analysisProperties.setProperty("sonar.host.url", host);
+    analysisProperties.setProperty("sonar.login", ScannerApiTestSuite.ORCHESTRATOR.getDefaultAdminToken());
     analysisProperties.putAll(extraProps);
     return (Map) analysisProperties;
   }