Remove AdoptOpenJDK

Signed-off-by: Dan Webb <[email protected]>
sous-chefs · Dec 3, 2024 · 1e8cd4b · 1e8cd4b
1 parent e33bb75
commit 1e8cd4b
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 559 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,14 +34,10 @@ jobs:
           - openjdk-11
           - openjdk-16
           - openjdk-17
-          - adoptopenjdk-8-openj9
-          - adoptopenjdk-11-hotspot
-          - adoptopenjdk-11-openj9
-          - adoptopenjdk-11-openj9-large-heap
-          - adoptopenjdk-14-hotspot
-          - adoptopenjdk-14-openj9
-          - adoptopenjdk-14-openj9-large-heap
-          - adoptopenjdk-removal-11-openj9
+          - temurin-8-hotspot
+          - temurin-11-hotspot
+          - semeru-11-openj9
+          - semeru-17-openj9
           - corretto-8
           - corretto-11
           - corretto-17
@@ -80,7 +76,7 @@ jobs:
           KITCHEN_LOCAL_YAML: kitchen.macos.yml
           TERM: xterm-256color
         with:
-          suite: adoptopenjdk-14
+          suite: temurin-11
           os: macos
           action: converge
       - name: Source Profile for JAVA_HOME
@@ -97,7 +93,7 @@ jobs:
           KITCHEN_LOCAL_YAML: kitchen.macos.yml
           TERM: xterm-256color
         with:
-          suite: adoptopenjdk-14
+          suite: temurin-11
           os: macos
           action: verify
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ This file is used to list changes made in each version of the Java cookbook.
 - CI: chore(deps): update sous-chefs/.github action to v3.1.0
 - CI: chore(deps): update actionshub/chef-install action to v3
 - Update platforms
+- Replace AdoptOpenJDK with Eclipse Temurin and IBM Semeru
 
 ## 12.0.7 - *2024-11-18*
 

diff --git a/documentation/resources/adoptopenjdk_install.md b/documentation/resources/adoptopenjdk_install.md
diff --git a/documentation/resources/adoptopenjdk_macos_install.md b/documentation/resources/adoptopenjdk_macos_install.md
diff --git a/kitchen.yml b/kitchen.yml
@@ -47,117 +47,46 @@ suites:
       inspec_tests: [test/integration/openjdk]
       inputs: { java_version: "17" }
 
-  # AdoptOpenJDK
-  # Version 8
-  - name: adoptopenjdk-8-hotspot
+  # Temurin/Semeru
+  - name: temurin-8-hotspot
     run_list:
-      - recipe[test::adoptopenjdk]
+      - recipe[test::openjdk]
     attributes:
       version: 8
       variant: hotspot
     verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-8-hotspot.yml
-
-  - name: adoptopenjdk-8-openj9
-    run_list:
-      - recipe[test::adoptopenjdk]
-    attributes:
-      version: 8
-      variant: openj9
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-8-openj9.yml
-
-  - name: adoptopenjdk-8-openj9-large-heap
-    run_list:
-      - recipe[test::adoptopenjdk]
-    attributes:
-      version: 8
-      variant: openj9-large-heap
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-8-openj9-large-heap.yml
+      inspec_tests: [test/integration/openjdk]
+      inputs: { java_version: "8" }
 
-  # Version 11
-  - name: adoptopenjdk-11-hotspot
+  - name: temurin-11-hotspot
     run_list:
-      - recipe[test::adoptopenjdk]
+      - recipe[test::openjdk]
     attributes:
       version: 11
       variant: hotspot
     verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-11-hotspot.yml
-  - name: adoptopenjdk-11-openj9
+      inspec_tests: [test/integration/openjdk]
+      inputs: { java_version: "11" }
+
+  - name: semeru-11-openj9
     run_list:
-      - recipe[test::adoptopenjdk]
+      - recipe[test::openjdk]
     attributes:
       version: 11
       variant: openj9
     verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-11-openj9.yml
-  - name: adoptopenjdk-11-openj9-large-heap
-    run_list:
-      - recipe[test::adoptopenjdk]
-    attributes:
-      version: 11
-      variant: openj9-large-heap
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-11-openj9-large-heap.yml
-
-  # Version 17
-  - name: adoptopenjdk-17-openj9-large-heap
-    run_list:
-      - recipe[test::adoptopenjdk]
-    attributes:
-      version: 17
-      variant: openj9-large-heap
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-17-openj9-large-heap.yml
+      inspec_tests: [test/integration/openjdk]
+      inputs: { java_version: "11" }
 
-  - name: adoptopenjdk-17-openj9
-    run_list:
-      - recipe[test::adoptopenjdk]
-    attributes:
-      version: 17
-      variant: openj9
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-17-openj9.yml
-  - name: adoptopenjdk-17-hotspot
+  - name: semeru-17-openj9
     run_list:
-      - recipe[test::adoptopenjdk]
+      - recipe[test::openjdk]
     attributes:
       version: 17
-      variant: hotspot
-    verifier:
-      inspec_tests: [test/integration/adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-14-hotspot.yml
-
-  # 11 Removal
-  - name: adoptopenjdk-removal-11-openj9
-    run_list:
-      - recipe[test::remove-adoptopenjdk-11-openj9]
-    attributes:
-      version: 11
       variant: openj9
     verifier:
-      inspec_tests: [test/integration/remove-adoptopenjdk]
-      input_files:
-        - test/integration/adoptopenjdk/inputs/adoptopenjdk-11-openj9.yml
+      inspec_tests: [test/integration/openjdk]
+      inputs: { java_version: "17" }
 
   # Corretto
   - name: corretto-8

diff --git a/libraries/adopt_openjdk_macos_helpers.rb b/libraries/adopt_openjdk_macos_helpers.rb
diff --git a/resources/adoptopenjdk_install.rb b/resources/adoptopenjdk_install.rb