Go back to temurin-24

Also add flag to disable --add-module-path for the temurin jlink capability

Author: MartelliEnrico

Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:24 AS builder
+FROM eclipse-temurin:24-alpine AS builder
 
 # bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ git:https://chromium.googlesource.com/webm/libwebp.git|^1
 # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST

build.gradle

@@ -48,17 +48,18 @@ description = 'Telegram bot to convert medias in the format required to be used
 
 java.toolchain {
     languageVersion = JavaLanguageVersion.of(24)
-    vendor = JvmVendorSpec.AZUL
+    vendor = JvmVendorSpec.ADOPTIUM
 }
 
 updateDaemonJvm {
     languageVersion = JavaLanguageVersion.of(24)
-    vendor = JvmVendorSpec.AZUL
+    vendor = JvmVendorSpec.ADOPTIUM
 }
 
 def jlink = tasks.register('jlink', JlinkTask) {
     options = ['--strip-debug', '--no-header-files', '--no-man-pages']
     modules = ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported']
+    includeModulePath = false
 
     group = 'build'
     description = 'Generates a minimal JRE for the project.'
@@ -72,7 +73,7 @@ test {
     finalizedBy(jacocoTestReport)
 
     testLogging {
-        events "passed"
+        events 'passed'
     }
 }
 

buildSrc/build.gradle

@@ -8,5 +8,5 @@ repositories {
 
 java.toolchain {
     languageVersion = JavaLanguageVersion.of(24)
-    vendor = JvmVendorSpec.AZUL
+    vendor = JvmVendorSpec.ADOPTIUM
 }

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

@@ -30,6 +30,9 @@ public abstract class JlinkTask extends DefaultTask {
 	@Input
 	public abstract ListProperty<@NotNull String> getModules();
 
+	@Input
+	public abstract Property<@NotNull Boolean> getIncludeModulePath();
+
 	@OutputDirectory
 	public abstract DirectoryProperty getOutputDirectory();
 
@@ -46,6 +49,7 @@ public abstract class JlinkTask extends DefaultTask {
 	public JlinkTask(ProjectLayout layout, JavaToolchainService javaToolchain) {
 		getOptions().convention(List.of());
 		getModules().convention(List.of("ALL-MODULE-PATH"));
+		getIncludeModulePath().convention(true);
 		getOutputDirectory().convention(layout.getBuildDirectory().dir("jlink"));
 
 		var toolchain = getProject().getExtensions().getByType(JavaPluginExtension.class).getToolchain();
@@ -71,8 +75,10 @@ public void createJre() {
 			var commandLine = new ArrayList<String>();
 			commandLine.add(jlink.toString());
 			commandLine.addAll(getOptions().get());
-			commandLine.add("--module-path");
-			commandLine.add(jmods.toString());
+			if (getIncludeModulePath().get()) {
+				commandLine.add("--module-path");
+				commandLine.add(jmods.toString());
+			}
 			commandLine.add("--add-modules");
 			commandLine.add(String.join(",", getModules().get()));
 			commandLine.add("--output");

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4175090548a4792cf1cef411becfba0f/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/50df1a9c218487a6519e22a0d29e6215/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f55af862790b0c395d3f70e23016df3d/redirect
-toolchainVendor=AZUL
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6d0adbce30460017fe61d2993dfa663e/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/50f16d2dc2bb80a421afc1af38fc92e3/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6d0adbce30460017fe61d2993dfa663e/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/50f16d2dc2bb80a421afc1af38fc92e3/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4f4ebe4f162f6deb29540c4ebe629d79/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/79d5995ef1c3e4df39a3b2f545cada5e/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/6d0adbce30460017fe61d2993dfa663e/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/50f16d2dc2bb80a421afc1af38fc92e3/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/61fdd87038cf8b094dadad8566609a29/redirect
+toolchainVendor=ADOPTIUM
 toolchainVersion=24

qodana.yaml

@@ -5,4 +5,4 @@ include:
   - name: VulnerableLibrariesGlobal
 # bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort
 linter: jetbrains/qodana-jvm:2025.1
-projectJDK: zulu-24
+projectJDK: temurin-24