Remove AdoptOpenJDK

Signed-off-by: Dan Webb <dan.webb@damacus.io>
sous-chefs · Dec 3, 2024 · 459b4e8 · 459b4e8
1 parent e33bb75
commit 459b4e8
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 618 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,22 +34,14 @@ 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
           - corretto-18
-          - custom-package-8
-          - custom-package-11
-          - custom-package-11-openj9
-          - custom-package-11-openj9-large-heap
       fail-fast: false
     steps:
       - name: Check out code
@@ -80,7 +72,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 +89,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
@@ -188,50 +117,3 @@ suites:
     verifier:
       inspec_tests: [test/integration/corretto]
       inputs: { java_version: "18" }
-
-  # Custom URL tests
-  - name: custom-package-8
-    run_list:
-      - recipe[test::custom_package]
-    attributes:
-      version: 8
-      variant: hotspot
-      url: http://ftp.osuosl.org/pub/osl/sous-chefs/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz
-      checksum: 7b7884f2eb2ba2d47f4c0bf3bb1a2a95b73a3a7734bd47ebf9798483a7bcc423
-    verifier:
-      inspec_tests: [test/integration/custom-package]
-      input_files: [test/integration/custom-package/inputs/hotspot-8.yml]
-  - name: custom-package-11
-    run_list:
-      - recipe[test::custom_package]
-    attributes:
-      version: 11
-      variant: hotspot
-      url: http://ftp.osuosl.org/pub/osl/sous-chefs/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz
-      checksum: 330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc
-    verifier:
-      inspec_tests: [test/integration/custom-package]
-      input_files: [test/integration/custom-package/inputs/hotspot-11.yml]
-  - name: custom-package-11-openj9
-    run_list:
-      - recipe[test::custom_package]
-    attributes:
-      version: 11
-      variant: openj9
-      url: http://ftp.osuosl.org/pub/osl/sous-chefs/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz
-      checksum: 1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690
-    verifier:
-      inspec_tests: [test/integration/custom-package]
-      input_files: [test/integration/custom-package/inputs/openj9-11.yml]
-  - name: custom-package-11-openj9-large-heap
-    run_list:
-      - recipe[test::custom_package]
-    attributes:
-      version: 11
-      variant: openj9-large-heap
-      url: http://ftp.osuosl.org/pub/osl/sous-chefs/OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.6_10_openj9-0.18.1.tar.gz
-      checksum: 6524d85d2ce334c955a4347015567326067ef15fe5f6a805714b25cace256f40
-    verifier:
-      inspec_tests: [test/integration/custom-package]
-      input_files:
-        [test/integration/custom-package/inputs/openj9-large-heap-11.yml]
diff --git a/libraries/adopt_openjdk_macos_helpers.rb b/libraries/adopt_openjdk_macos_helpers.rb