Merge a3c03fb332 into fd08b9c8dc

dist/setup/index.js

@@ -124232,10 +124232,16 @@ 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.
                 if (jdkVersion.split('.').length > 3) {
-                    const jdkVersionNums = jdkVersion
-                        .replace('+', '.')
-                        .split('.');
-                    jdkVersion = (0, util_1.convertVersionToSemver)(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
+                    const jdkVersionNums = jdkVersion.split('.');
+                    const splitedJdkVersionList = jdkVersionNums.slice(0, 3);
+                    if (jdkVersion.includes('+')) {
+                        const buildParts = jdkVersion.split('+');
+                        splitedJdkVersionList.push(buildParts[buildParts.length - 1]);
+                    }
+                    else {
+                        splitedJdkVersionList.push(jdkVersionNums[jdkVersionNums.length - 1]);
+                    }
+                    jdkVersion = (0, util_1.convertVersionToSemver)(splitedJdkVersionList.join('.'));
                 }
                 for (const edition in archMap) {
                     eligibleVersions.push({

src/distributions/dragonwell/installer.ts

@@ -150,15 +150,18 @@ 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.
         if (jdkVersion.split('.').length > 3) {
-          const jdkVersionNums: string[] = jdkVersion
-            .replace('+', '.')
-            .split('.');
-          jdkVersion = convertVersionToSemver(
-            `${jdkVersionNums.slice(0, 3).join('.')}.${
+          const jdkVersionNums: string[] = jdkVersion.split('.');
+          const splitedJdkVersionList: string[] = jdkVersionNums.slice(0, 3);
+          if (jdkVersion.includes('+')) {
+            const buildParts: string[] = jdkVersion.split('+');
+            splitedJdkVersionList.push(buildParts[buildParts.length - 1]);
+          } else {
+            splitedJdkVersionList.push(
               jdkVersionNums[jdkVersionNums.length - 1]
-            }`
             );
           }
+          jdkVersion = convertVersionToSemver(splitedJdkVersionList.join('.'));
+        }
 
         for (const edition in archMap) {
           eligibleVersions.push({