SCANJLIB-208 Use the new bootstrapping on -SNAPSHOT builds

Author: henryju

lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java

@@ -111,7 +111,7 @@ public ScannerEngineFacade bootstrap() {
 
     if (isSimulation) {
       return new SimulationScannerEngineFacade(properties, isSonarCloud, serverVersion);
-    } else if (isSonarCloud || VersionUtils.isAtLeast(serverVersion, SQ_VERSION_NEW_BOOTSTRAPPING)) {
+    } else if (isSonarCloud || VersionUtils.isAtLeastIgnoringQualifier(serverVersion, SQ_VERSION_NEW_BOOTSTRAPPING)) {
       var launcher = scannerEngineLauncherFactory.createLauncher(serverConnection, fileCache, properties);
       return new NewScannerEngineFacade(properties, launcher, isSonarCloud, serverVersion);
     } else {

lib/src/main/java/org/sonarsource/scanner/lib/internal/util/VersionUtils.java

@@ -35,10 +35,10 @@ private VersionUtils() {
    * @param targetVersion the target version to compare with
    * @return true if the version is at least the target version
    */
-  public static boolean isAtLeast(@Nullable String version, String targetVersion) {
+  public static boolean isAtLeastIgnoringQualifier(@Nullable String version, String targetVersion) {
     if (StringUtils.isBlank(version) || String.valueOf(version.charAt(0)).matches("\\D")) {
       return false;
     }
-    return Version.parse(version).compareTo(Version.parse(targetVersion)) >= 0;
+    return Version.parse(StringUtils.substringBefore(version, "-")).compareTo(Version.parse(targetVersion)) >= 0;
   }
 }

lib/src/test/java/org/sonarsource/scanner/lib/internal/util/VersionUtilsTest.java

@@ -27,19 +27,19 @@
 class VersionUtilsTest {
 
   @Test
-  void isAtLeast_shouldCompareCorrectly() {
-    assertThat(VersionUtils.isAtLeast("10.5", "10.5")).isTrue();
-    assertThat(VersionUtils.isAtLeast("10.10", "10.5")).isTrue();
-    assertThat(VersionUtils.isAtLeast(null, "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("105", "10.5")).isTrue();
-    assertThat(VersionUtils.isAtLeast("10", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("10.0", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("trash", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("11.0.0", "10.5")).isTrue();
-    assertThat(VersionUtils.isAtLeast("10.4.9", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("10.5-SNAPSHOT", "10.5")).isFalse();
-    assertThat(VersionUtils.isAtLeast("10.6-SNAPSHOT", "10.5")).isTrue();
-    assertThat(VersionUtils.isAtLeast("10.5.0.1234", "10.5")).isTrue();
+  void isAtLeast_IgnoringQualifier_shouldCompareCorrectly() {
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.5", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.10", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier(null, "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("105", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10", "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.0", "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("", "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("trash", "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("11.0.0", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.4.9", "10.5")).isFalse();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.5-SNAPSHOT", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.6-SNAPSHOT", "10.5")).isTrue();
+    assertThat(VersionUtils.isAtLeastIgnoringQualifier("10.5.0.1234", "10.5")).isTrue();
   }
 }