From 2aba19c817d76d0fca0c978cf580c61f639bb94e Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 19 Jul 2024 16:04:05 -0400 Subject: [PATCH] Remove "beta" URLs for RISC-V Adoptium offers 17-LTS now. --- src/qz/build/jlink/Url.java | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/qz/build/jlink/Url.java b/src/qz/build/jlink/Url.java index ca98f9b1c..11cf0e3b2 100644 --- a/src/qz/build/jlink/Url.java +++ b/src/qz/build/jlink/Url.java @@ -37,26 +37,6 @@ public Url(Vendor vendor) { pattern = VENDOR_URL_MAP.get(vendor); } - /** - * Fix URLs for beta/alpha/nightly release - */ - public void applyBetaPattern() { - switch(vendor) { - case ECLIPSE: - /* - BEFORE: jdk-21.0.1+12/ - AFTER: jdk-21.0.1+12-ea-beta/ - - BEFORE: OpenJDK21U-jdk_riscv64_linux_hotspot_21-0-1-12.tar.gz - AFTER: OpenJDK21U-jdk_riscv64_linux_hotspot_ea_21-0-1-12.tar.gz - */ - pattern = pattern.replaceAll("%s/OpenJDK%sU-jdk_%s_%s_%s", "%s-ea-beta/OpenJDK%sU-jdk_%s_%s_%s_ea"); - break; - default: - throw new UnsupportedOperationException("Vendor " + vendor + " is missing a configuration beta URLs"); - } - } - public String format(Arch arch, Platform platform, String gcEngine, Version javaSemver, String javaVersion, String gcVer) throws UnsupportedEncodingException { Url pattern = new Url(vendor); String urlArch = vendor.getUrlArch(arch); @@ -69,15 +49,6 @@ public String format(Arch arch, Platform platform, String gcEngine, Version java int javaMajor = javaSemver.getMajorVersion(); - switch(arch) { - // TODO: Remove when RISCV is offered as stable - case RISCV64: - pattern.applyBetaPattern(); - urlJavaVersion = urlJavaVersion.replace(".", "-").replace("_", "-"); - default: - // Do nothing - } - switch(vendor) { case BELLSOFT: return String.format(pattern.pattern, urlJavaVersionEncode, urlJavaVersionEncode, urlPlatform, urlArch, fileExt);