Merge pull request actions#489 from anishi1222/main

nikolai-laevskii · web-flow · commit 3927f4735774 · 2023-06-08T10:58:50.000+02:00
Update versions of Oracle JDK and Microsoft Build of OpenJDK
diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml
@@ -31,7 +31,7 @@ jobs:
             'semeru',
             'corretto'
           ] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '16']
+        version: ['8', '11', '17']
         exclude:
           - distribution: microsoft
             version: 8
@@ -41,10 +41,10 @@ jobs:
             version: 17
           - distribution: oracle
             os: windows-latest
-            version: 19
+            version: 20
           - distribution: oracle
             os: ubuntu-latest
-            version: 19
+            version: 20
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -70,11 +70,11 @@ jobs:
         version:
           - '11.0'
           - '8.0.302'
-          - '16.0.2+7'
+          - '17.0.7+7'
         include:
           - distribution: oracle
             os: ubuntu-latest
-            version: '19.0.1'
+            version: '20.0.1'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/__tests__/distributors/microsoft-installer.test.ts b/__tests__/distributors/microsoft-installer.test.ts
@@ -36,8 +36,8 @@ describe('findPackageForDownload', () => {
     ],
     [
       '17.x',
-      '17.0.3',
-      'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+      '17.0.7',
+      'https://aka.ms/download-jdk/microsoft-jdk-17.0.7-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ],
     [
       '16.0.x',
@@ -53,6 +53,11 @@ describe('findPackageForDownload', () => {
       '11.0.15',
       '11.0.15',
       'https://aka.ms/download-jdk/microsoft-jdk-11.0.15-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+    ],
+    [
+      '11.x',
+      '11.0.19',
+      'https://aka.ms/download-jdk/microsoft-jdk-11.0.19-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
     const result = await distribution['findPackageForDownload'](input);
@@ -97,7 +102,7 @@ describe('findPackageForDownload', () => {
       });
 
       const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.3-linux-${distroArch}.tar.gz`;
+      const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.7-linux-${distroArch}.tar.gz`;
 
       expect(result.url).toBe(expectedUrl);
     }
diff --git a/__tests__/distributors/oracle-installer.test.ts b/__tests__/distributors/oracle-installer.test.ts
@@ -21,19 +21,14 @@ describe('findPackageForDownload', () => {
 
   it.each([
     [
-      '19',
-      '19',
-      'https://download.oracle.com/java/19/latest/jdk-19_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      '20',
+      '20',
+      'https://download.oracle.com/java/20/latest/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
-      '19.0.1',
-      '19.0.1',
-      'https://download.oracle.com/java/19/archive/jdk-19.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '18.0.2.1',
-      '18.0.2.1',
-      'https://download.oracle.com/java/18/archive/jdk-18.0.2.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      '20.0.1',
+      '20.0.1',
+      'https://download.oracle.com/java/20/archive/jdk-20.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
       '17',
diff --git a/src/distributions/microsoft/microsoft-openjdk-versions.json b/src/distributions/microsoft/microsoft-openjdk-versions.json
