diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.16.eb b/easybuild/easyconfigs/j/Java/Java-11.0.16.eb index 54edbc4e9f1..d2948fd06a3 100644 --- a/easybuild/easyconfigs/j/Java/Java-11.0.16.eb +++ b/easybuild/easyconfigs/j/Java/Java-11.0.16.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '11.0.16' -local_build = '8' +_java_version = '11' +_patch_version = '16' +_build_version = '8' +version = f'{_java_version}.0.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): 'f79506f80c796d8e6a382f00bd8c528a330c5e29581aaf5cb61e1831742d166f', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): 'bb345cabf3e305ff3ce390918d5f69e5cfbced3d9844e0b0531c2690f9ed06ef', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '40dea12da26443ad731f9348187b65451711659337e83b6409a2bcf0f057cd2a', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.18.eb b/easybuild/easyconfigs/j/Java/Java-11.0.18.eb index c41c7c582f9..c4246e54dea 100644 --- a/easybuild/easyconfigs/j/Java/Java-11.0.18.eb +++ b/easybuild/easyconfigs/j/Java/Java-11.0.18.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '11.0.18' -local_build = '10' +_java_version = '11' +_patch_version = '18' +_build_version = '10' +version = f'{_java_version}.0.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '459148d489b08ceec2d901e950ac36722b4c55e907e979291ddfc954ebdcea47', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-11.0.20.eb b/easybuild/easyconfigs/j/Java/Java-11.0.20.eb index a66db856ead..f9d9782b085 100644 --- a/easybuild/easyconfigs/j/Java/Java-11.0.20.eb +++ b/easybuild/easyconfigs/j/Java/Java-11.0.20.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '11.0.20' -local_build = '8' +_java_version = '11' +_patch_version = '20' +_build_version = '8' +version = f'{_java_version}.0.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): 'eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '1125931b3a38e6e305a1932fc6cfd0b023a0fbec2cab10e835a2ee2c50848b42', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-16.0.1.eb b/easybuild/easyconfigs/j/Java/Java-16.0.1.eb index 02f8adce5e5..7a339604a5d 100644 --- a/easybuild/easyconfigs/j/Java/Java-16.0.1.eb +++ b/easybuild/easyconfigs/j/Java/Java-16.0.1.eb @@ -7,15 +7,15 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and toolchain = SYSTEM -local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz' +_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz' source_urls = ['https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL'] -sources = [local_tarball_tmpl % '%(jdkarch)s'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % 'x64': + _tarball_tmpl.format('x64'): 'b1198ffffb7d26a3fdedc0fa599f60a0d12aa60da1714b56c1defbce95d8b235', - local_tarball_tmpl % 'aarch64': + _tarball_tmpl.format('aarch64'): '602b005074777df2a0b4306e20152a6446803edd87ccbab95b2f313c4d9be6ba', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.1.eb b/easybuild/easyconfigs/j/Java/Java-17.0.1.eb index b32ffe92e25..25aa77631f2 100644 --- a/easybuild/easyconfigs/j/Java/Java-17.0.1.eb +++ b/easybuild/easyconfigs/j/Java/Java-17.0.1.eb @@ -7,15 +7,15 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz' +_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz' source_urls = ['https://download.java.net/java/GA/jdk%(version)s/2a2082e5a09d4267845be086888add4f/12/GPL/'] -sources = [local_tarball_tmpl % '%(jdkarch)s'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % 'x64': + _tarball_tmpl.format('x64'): '1c0a73cbb863aad579b967316bf17673b8f98a9bb938602a140ba2e5c38f880a', - local_tarball_tmpl % 'aarch64': + _tarball_tmpl.format('aarch64'): '86653d48787e5a1c029df10da7808194fe8bd931ddd72ff3d42850bf1afb317e', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.2.eb b/easybuild/easyconfigs/j/Java/Java-17.0.2.eb index 2e19cdba6cc..5ba6ab02034 100644 --- a/easybuild/easyconfigs/j/Java/Java-17.0.2.eb +++ b/easybuild/easyconfigs/j/Java/Java-17.0.2.eb @@ -7,15 +7,15 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'openjdk-%%(version)s_linux-%s_bin.tar.gz' +_tarball_tmpl = f'openjdk-{version}_linux-{{}}_bin.tar.gz' source_urls = ['https://download.java.net/java/GA/jdk%(version)s/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/'] -sources = [local_tarball_tmpl % '%(jdkarch)s'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % 'x64': + _tarball_tmpl.format('x64'): '0022753d0cceecacdd3a795dd4cea2bd7ffdf9dc06e22ffd1be98411742fbb44', - local_tarball_tmpl % 'aarch64': + _tarball_tmpl.format('aarch64'): '13bfd976acf8803f862e82c7113fb0e9311ca5458b1decaef8a09ffd91119fa4', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.4.eb b/easybuild/easyconfigs/j/Java/Java-17.0.4.eb index 2fed82fb259..7666ff8e3ca 100644 --- a/easybuild/easyconfigs/j/Java/Java-17.0.4.eb +++ b/easybuild/easyconfigs/j/Java/Java-17.0.4.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '17.0.4' -local_build = '8' +_java_version = '17' +_patch_version = '4' +_build_version = '8' +version = f'{_java_version}.0.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): 'c0851d610b03cb51e9b360fef3e9ec2026c62837a143e7786649ba94f38cc0d1', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '8c23b0b9c65cfe223a07edb8752026afd1e8ec1682630c2d92db4dd5aa039204', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): 'e80a0f6626bd28ea20c43524b3ab10af48b3789317aea5b7019c146fe6268d94', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-17.0.6.eb b/easybuild/easyconfigs/j/Java/Java-17.0.6.eb index 71d89858ea4..bf42b2f6af9 100644 --- a/easybuild/easyconfigs/j/Java/Java-17.0.6.eb +++ b/easybuild/easyconfigs/j/Java/Java-17.0.6.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '17.0.6' -local_build = '10' +_java_version = '17' +_patch_version = '6' +_build_version = '10' +version = f'{_java_version}.0.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): 'a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): 'cb772c3fdf3f9fed56f23a37472acf2b80de20a7113fe09933891c6ef0ecde95', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-19.0.2.eb b/easybuild/easyconfigs/j/Java/Java-19.0.2.eb index f856b0a1fd7..bd10a319b1a 100644 --- a/easybuild/easyconfigs/j/Java/Java-19.0.2.eb +++ b/easybuild/easyconfigs/j/Java/Java-19.0.2.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '19.0.2' -local_build = '7' +_java_version = '19' +_patch_version = '2' +_build_version = '7' +version = f'{_java_version}.0.{_patch_version}' homepage = 'https://openjdk.org' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,19 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-21.0.2.eb b/easybuild/easyconfigs/j/Java/Java-21.0.2.eb index bcbc951be1b..fa94a44b99c 100644 --- a/easybuild/easyconfigs/j/Java/Java-21.0.2.eb +++ b/easybuild/easyconfigs/j/Java/Java-21.0.2.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '21.0.2' -local_build = '13' +_java_version = '21' +_patch_version = '2' +_build_version = '13' +version = f'{_java_version}.0.{_patch_version}' homepage = 'https://openjdk.org' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,23 +10,21 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '3ce6a2b357e2ef45fd6b53d6587aa05bfec7771e7fb982f2c964f6b771b7526a', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): 'd08de863499d8851811c893e8915828f2cd8eb67ed9e29432a6b4e222d80a12f', - local_tarball_tmpl % ('riscv64', local_build): + _tarball_tmpl.format('riscv64'): '791a37ddb040e1a02bbfc61abfbc7e7321431a28054c9ac59ba1738fd5320b02', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-21.0.5.eb b/easybuild/easyconfigs/j/Java/Java-21.0.5.eb index 932318fd336..38131a7777a 100644 --- a/easybuild/easyconfigs/j/Java/Java-21.0.5.eb +++ b/easybuild/easyconfigs/j/Java/Java-21.0.5.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '21.0.5' -local_build = '11' +_java_version = '21' +_patch_version = '5' +_build_version = '11' +version = f'{_java_version}.0.{_patch_version}' homepage = 'https://openjdk.org' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,23 +10,21 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK%%(version_major)sU-jdk_%s_linux_hotspot_%%(version)s_%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot_{version}_{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin%%(version_major)s-binaries/releases/download/jdk-%%(version)s+%s/' - % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk-{version}+{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef', - local_tarball_tmpl % ('riscv64', local_build): + _tarball_tmpl.format('riscv64'): '2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-8.345.eb b/easybuild/easyconfigs/j/Java/Java-8.345.eb index a13f77db4f2..9d6e98231cf 100644 --- a/easybuild/easyconfigs/j/Java/Java-8.345.eb +++ b/easybuild/easyconfigs/j/Java/Java-8.345.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '8.345' -local_build = 'b01' +_java_version = '8' +_patch_version = '345' +_build_version = 'b01' +version = f'{_java_version}.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,21 +10,20 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot' +_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/' - 'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk{_java_version}u{_patch_version}-{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): 'ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): 'c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): 'f2be72678f6c2ad283453d0e21a6cb03144dda356e4edf79f818d99c37feaf34', } ] diff --git a/easybuild/easyconfigs/j/Java/Java-8.362.eb b/easybuild/easyconfigs/j/Java/Java-8.362.eb index f8c6b809aa0..4affe58bfe0 100644 --- a/easybuild/easyconfigs/j/Java/Java-8.362.eb +++ b/easybuild/easyconfigs/j/Java/Java-8.362.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '8.362' -local_build = 'b09' +_java_version = '8' +_patch_version = '362' +_build_version = 'b09' +version = f'{_java_version}.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,23 +10,21 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot' +_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/' - 'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk{_java_version}u{_patch_version}-{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): '1486a792fb224611ce0cd0e83d4aacd3503b56698549f8e9a9f0a6ebb83bdba1', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '9290a8beefd7a94f0eb030f62d402411a852100482b9c5b63714bacc57002c2a', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '69658dd316c6a160915655971573179766e19c6610ea03880c1e578a0e518f74', - } ] diff --git a/easybuild/easyconfigs/j/Java/Java-8.402.eb b/easybuild/easyconfigs/j/Java/Java-8.402.eb index d130041813b..7dc25b1f64b 100644 --- a/easybuild/easyconfigs/j/Java/Java-8.402.eb +++ b/easybuild/easyconfigs/j/Java/Java-8.402.eb @@ -1,6 +1,8 @@ name = 'Java' -version = '8.402' -local_build = 'b06' +_java_version = '8' +_patch_version = '402' +_build_version = 'b06' +version = f'{_java_version}.{_patch_version}' homepage = 'http://openjdk.java.net' description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy @@ -8,23 +10,21 @@ Java applications on desktops and servers.""" toolchain = SYSTEM -local_tarball_tmpl = 'OpenJDK8U-jdk_%s_linux_hotspot_%%(version_major)su%%(version_minor)s%s.tar.gz' +_tarball_tmpl = f'OpenJDK{_java_version}U-jdk_{{}}_linux_hotspot' +_tarball_tmpl += f'_{_java_version}u{_patch_version}{_build_version}.tar.gz' # Using the Adoptium Eclipse Temurin builds, recommended by https://whichjdk.com/#distributions - -source_urls = ['https://github.com/adoptium/temurin8-binaries/releases/download/' - 'jdk%%(version_major)su%%(version_minor)s-%s/' % local_build] -sources = [local_tarball_tmpl % ('%(jdkarch)s', local_build)] - +source_urls = [f'https://github.com/adoptium/temurin{_java_version}-binaries/releases/download/' + f'jdk{_java_version}u{_patch_version}-{_build_version}/'] +sources = [_tarball_tmpl.format('%(jdkarch)s')] checksums = [ { - local_tarball_tmpl % ('x64', local_build): + _tarball_tmpl.format('x64'): 'fcfd08abe39f18e719e391f2fc37b8ac1053075426d10efac4cbf8969e7aa55e', - local_tarball_tmpl % ('aarch64', local_build): + _tarball_tmpl.format('aarch64'): '241a72d6f0051de30c71e7ade95b34cd85a249c8e5925bcc7a95872bee81fd84', - local_tarball_tmpl % ('ppc64le', local_build): + _tarball_tmpl.format('ppc64le'): '64bc05cdffe827c84000177dca2eb4ff0a8ff0021889bb75abff3639d4f51838', - } ]