Switched to Adoptium for JDK (#404)

AdoptOpenJDK doesn't provide recent releases.
gantsign · Aug 11, 2024 · 350eda6 · 350eda6
1 parent 9eda8f0
commit 350eda6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -50,8 +50,8 @@
 
     - name: Download jdk 11
       ansible.builtin.get_url:
-        url: 'https://api.adoptopenjdk.net/v3/binary/version/jdk-11.0.6%2B10/linux/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk'
-        dest: '/opt/java/jdk-11.0.6.tar.gz'
+        url: 'https://api.adoptium.net/v3/binary/version/jdk-11.0.24%2B8/linux/x64/jdk/hotspot/normal/adoptium?project=jdk'
+        dest: '/opt/java/jdk-11.0.24.tar.gz'
         force: false
         use_proxy: true
         validate_certs: true
@@ -61,18 +61,18 @@
     - name: Install jdk 11
       become: true
       ansible.builtin.unarchive:
-        src: '/opt/java/jdk-11.0.6.tar.gz'
+        src: '/opt/java/jdk-11.0.24.tar.gz'
         remote_src: true
         dest: '/opt/java'
         owner: root
         group: root
         mode: 'o-w'
-        creates: '/opt/java/jdk-11.0.6+10/bin'
+        creates: '/opt/java/jdk-11.0.24+8/bin'
 
     - name: Set facts for openjdk locations
       ansible.builtin.set_fact:
         jdk8_home: '/usr/lib/jvm/java-1.8.0-openjdk-amd64'
-        jdk11_home: '/opt/java/jdk-11.0.6+10'
+        jdk11_home: '/opt/java/jdk-11.0.24+8'
 
     - name: Create example files dir
       become: true

diff --git a/molecule/default/tests/test_role.py b/molecule/default/tests/test_role.py
@@ -8,7 +8,7 @@ def test_idea_installed(host):
 @pytest.mark.parametrize('file_path,expected_text', [
     ('disabled_plugins.txt', 'org.jetbrains.plugins.gradle'),
     ('options/jdk.table.xml', '/usr/lib/jvm/java-1.8.0-openjdk'),
-    ('options/jdk.table.xml', '/opt/java/jdk-11.0.6+10'),
+    ('options/jdk.table.xml', '/opt/java/jdk-11.0.24+8'),
     ('options/project.default.xml', '/test/maven/home'),
     ('codestyles/Example1.xml', 'code_scheme name="Example1"'),
     ('codestyles/Example2.xml', 'code_scheme name="Example2"'),

diff --git a/molecule/ultimate/converge.yml b/molecule/ultimate/converge.yml
@@ -44,8 +44,8 @@
 
     - name: Download jdk 11
       ansible.builtin.get_url:
-        url: 'https://api.adoptopenjdk.net/v3/binary/version/jdk-11.0.6%2B10/linux/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk'
-        dest: '/opt/java/jdk-11.0.6.tar.gz'
+        url: 'https://api.adoptium.net/v3/binary/version/jdk-11.0.24%2B8/linux/x64/jdk/hotspot/normal/adoptium?project=jdk'
+        dest: '/opt/java/jdk-11.0.24.tar.gz'
         force: false
         use_proxy: true
         validate_certs: true
@@ -55,18 +55,18 @@
     - name: Install jdk 11
       become: true
       ansible.builtin.unarchive:
-        src: '/opt/java/jdk-11.0.6.tar.gz'
+        src: '/opt/java/jdk-11.0.24.tar.gz'
         remote_src: true
         dest: '/opt/java'
         owner: root
         group: root
         mode: 'o-w'
-        creates: '/opt/java/jdk-11.0.6+10/bin'
+        creates: '/opt/java/jdk-11.0.24+8/bin'
 
     - name: Set facts for openjdk locations
       ansible.builtin.set_fact:
         jdk8_home: '/usr/lib/jvm/java-1.8.0-openjdk-amd64'
-        jdk11_home: '/opt/java/jdk-11.0.6+10'
+        jdk11_home: '/opt/java/jdk-11.0.24+8'
 
     - name: Create example files dir
       become: true