Merge 707d85cf01 into fd08b9c8dc

dist/setup/index.js

@@ -124231,10 +124231,12 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
                 }
                 // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
                 // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-                const jdkVersionNums = jdkVersion
+                if (jdkVersion.split('.').length > 3) {
-                    .replace('+', '.')
+                    const jdkVersionNums = jdkVersion
-                    .split('.');
+                        .replace('+', '.')
-                jdkVersion = (0, util_1.convertVersionToSemver)(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
+                        .split('.');
+                    jdkVersion = (0, util_1.convertVersionToSemver)(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
+                }
                 for (const edition in archMap) {
                     eligibleVersions.push({
                         os: platform,

src/distributions/dragonwell/installer.ts

@@ -149,14 +149,16 @@ export class DragonwellDistribution extends JavaBase {
 
         // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
         // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-        const jdkVersionNums: string[] = jdkVersion
+        if (jdkVersion.split('.').length > 3) {
-          .replace('+', '.')
+          const jdkVersionNums: string[] = jdkVersion
-          .split('.');
+            .replace('+', '.')
-        jdkVersion = convertVersionToSemver(
+            .split('.');
-          `${jdkVersionNums.slice(0, 3).join('.')}.${
+          jdkVersion = convertVersionToSemver(
-            jdkVersionNums[jdkVersionNums.length - 1]
+            `${jdkVersionNums.slice(0, 3).join('.')}.${
-          }`
+              jdkVersionNums[jdkVersionNums.length - 1]
-        );
+            }`
+          );
+        }
 
         for (const edition in archMap) {
           eligibleVersions.push({