Update bundled Java runtime to 21.0.5+11

spitzerd · spitzerd · commit d782ae1ff8a3 · 2024-12-28T13:49:53.000+01:00
diff --git a/changelog.xml b/changelog.xml
@@ -13,6 +13,9 @@
   </properties>
   <body>
     <release version="18.5.0" date="upcoming">
+      <action type="update">
+        Update bundled Java runtime from 21.0.4+7 to 21.0.5+11. No separate beta Java runtime build is required anymore for Windows aarch64.
+      </action>
     </release>
     <release version="18.4.0" date="2024-12-23">
       <action type="add" issue="valentjn/ltex-ls#268" due-to="Benoît Pasquier">
diff --git a/tools/createBinaryArchives.py b/tools/createBinaryArchives.py
@@ -19,7 +19,7 @@
 import os
 import stat
 
-javaVersion = "21.0.4+7"
+javaVersion = "21.0.5+11"
 
 
 
@@ -98,12 +98,6 @@ def downloadJava(tmpDirPath: pathlib.Path, ltexLsDirPath: pathlib.Path,
       f"jdk-{urllib.parse.quote_plus(javaVersion)}/{javaArchiveName}")
   relativeJavaDirPathString = f"jdk-{javaVersion}"
 
-  # See https://github.com/adoptium/adoptium-support/issues/616
-  if platform == "windows" and arch == "aarch64":
-    print("Temurin JDK for Windows on ARM is currently available as beta version only.")    
-    relativeJavaDirPathString = "jdk-21.0.5+9"
-    javaUrl = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B9-ea-beta/OpenJDK21U-jdk_aarch64_windows_hotspot_21.0.5_9-ea.zip"
-
   javaArchivePath = ltexLsDirPath.joinpath(javaArchiveName)
   print(f"Downloading JDK from '{javaUrl}' to '{javaArchivePath}'...")
   urllib.request.urlretrieve(javaUrl, javaArchivePath)
