ORCH-494 Update embedded Scanner CLI to 6.2.1

SonarSource · Oct 9, 2024 · 1d230bb · 1d230bb
1 parent e1d97e7
commit 1d230bb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/sonar-orchestrator/src/main/java/com/sonar/orchestrator/build/SonarScanner.java b/sonar-orchestrator/src/main/java/com/sonar/orchestrator/build/SonarScanner.java
@@ -39,7 +39,7 @@
  */
 public class SonarScanner extends Build<SonarScanner> {
 
-  public static final String DEFAULT_SCANNER_VERSION = "6.0.0.4432";
+  public static final String DEFAULT_SCANNER_VERSION = "6.2.1.4610";
   public static final String PROP_KEY_SOURCE_ENCODING = "sonar.sourceEncoding";
 
   private Version scannerVersion = Version.create(DEFAULT_SCANNER_VERSION);

diff --git a/sonar-orchestrator/src/main/java/com/sonar/orchestrator/build/SonarScannerInstaller.java b/sonar-orchestrator/src/main/java/com/sonar/orchestrator/build/SonarScannerInstaller.java
@@ -87,7 +87,7 @@ void doInstall(Version scannerVersion, @Nullable String classifier, File toDir)
   private File locateZip(Version scannerVersion, @Nullable String classifier) {
     File zipFile = null;
     String cl = classifier == null ? "" : ("-" + classifier);
-    URL zip = SonarScannerInstaller.class.getResource("/com/sonar/orchestrator/build/sonar-scanner-cli-" + scannerVersion.toString() + cl + ".zip");
+    URL zip = SonarScannerInstaller.class.getResource("/com/sonar/orchestrator/build/sonar-scanner-cli-" + scannerVersion + cl + ".zip");
     if (zip != null) {
       try {
         // can't unzip directly from jar resource. It has to be copied in a temp directory.

diff --git a/...estrator/src/main/resources/com/sonar/orchestrator/build/sonar-scanner-cli-6.0.0.4432.zip b/...estrator/src/main/resources/com/sonar/orchestrator/build/sonar-scanner-cli-6.0.0.4432.zip
diff --git a/...estrator/src/main/resources/com/sonar/orchestrator/build/sonar-scanner-cli-6.2.1.4610.zip b/...estrator/src/main/resources/com/sonar/orchestrator/build/sonar-scanner-cli-6.2.1.4610.zip