ubuntu-latest to ubuntu-22.04

.github/workflows/e2e-versions.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-2022, ubuntu-22.04]
         distribution: [
             'temurin',
             'adopt',
@@ -37,10 +37,10 @@ jobs:
           - distribution: microsoft
             version: 8
           - distribution: dragonwell
-            os: macos-latest
+            os: macos-13
         include:
           - distribution: oracle
-            os: macos-latest
+            os: macos-13
             version: 17
           - distribution: oracle
             os: windows-latest
@@ -48,12 +48,6 @@ jobs:
           - distribution: oracle
             os: ubuntu-latest
             version: 20
-          - distribution: dragonwell
-            os: ubuntu-latest
-            version: '11.0'
-          - distribution: dragonwell
-            os: ubuntu-latest
-            version: '11.0.13+9'
 
     steps:
       - name: Checkout
@@ -75,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         distribution: ['temurin', 'zulu', 'liberica']
         version:
           - '11.0'
@@ -177,7 +171,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         version: ['17-ea', '15.0.0-ea.14']
     steps:
       - name: Checkout
@@ -221,7 +215,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         distribution: ['temurin', 'zulu', 'liberica', 'semeru']
         java-package: ['jre']
         version: ['17.0']
@@ -269,7 +263,7 @@ jobs:
       fail-fast: false
       matrix:
         # x86 is not supported on macOS
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-22.04]
         distribution: ['liberica', 'zulu', 'corretto']
         version: ['11']
     steps:

dist/setup/index.js

@@ -130914,9 +130914,10 @@ 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) {
-                    jdkVersion = util_1.convertVersionToSemver(jdkVersion);
-                }
+                const jdkVersionNums = jdkVersion
+                    .replace('+', '.')
+                    .split('.');
+                jdkVersion = 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,9 +149,14 @@ 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) {
-          jdkVersion = convertVersionToSemver(jdkVersion);
-        }
+        const jdkVersionNums: string[] = jdkVersion
+          .replace('+', '.')
+          .split('.');
+        jdkVersion = convertVersionToSemver(
+          `${jdkVersionNums.slice(0, 3).join('.')}.${
+            jdkVersionNums[jdkVersionNums.length - 1]
+          }`
+        );
 
         for (const edition in archMap) {
           eligibleVersions.push({