unixPB aixPB winPB: Update boot JDKs to match current requirements

Signed-off-by: Stewart X Addison <sxa@redhat.com>
adoptium · May 24, 2023 · 1a34113 · 1a34113
1 parent d9b705d
commit 1a34113
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml
@@ -17,8 +17,8 @@
       - '8'
       - '10'
       - '11'
-      - '16'
       - '17'
+      - '20'
 
 - name: Set /usr/java8_64 as default
   file:

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -111,15 +111,15 @@
         - ansible_distribution != "Solaris"
         - ansible_architecture != "riscv64"
       tags: build_tools
-    - role: adoptopenjdk_install  # JDK19 Build Bootstrap
-      jdk_version: 18
+    - role: adoptopenjdk_install  # JDK20 Build Bootstrap
+      jdk_version: 19
       when:
         - ansible_distribution != "Alpine"
         - ansible_distribution != "Solaris"
         - ansible_architecture != "riscv64"
       tags: build_tools
-    - role: adoptopenjdk_install  # JDK20 Build Bootstrap
-      jdk_version: 19
+    - role: adoptopenjdk_install  # JDK21 Build Bootstrap
+      jdk_version: 20
       when:
         - ansible_distribution != "Alpine"
         - ansible_distribution != "Solaris"

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -60,12 +60,12 @@
       jdk_version: 10
     - role: Java_install          # For Gradle
       jdk_version: 11
-    - role: Java_install          # JDK16 build bootstrap
-      jdk_version: 15
-    - role: Java_install          # JDK17 build bootstrap
-      jdk_version: 16
-    - role: Java_install
+    - role: Java_install          # Latest LTS, for use by agents
       jdk_version: 17
+    - role: Java_install          # Bootstrap for JDK20
+      jdk_version: 19
+    - role: Java_install          # Bootstrap for JDK21
+      jdk_version: 20
     - ANT                         # Testing
     - role: MSVS_2013
       when: ansible_architecture == "64-bit"