Enable JDK-EA builds again

build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts

@@ -35,6 +35,8 @@ testing {
 }
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_24
+    targetCompatibility = JavaVersion.VERSION_24
     toolchain {
         // If this is updated, also update
         // - build.gradle -> jacoco -> toolVersion (because JaCoCo does not support newest JDK out of the box. Check versions at https://www.jacoco.org/jacoco/trunk/doc/changes.html)
@@ -49,6 +51,6 @@ java {
         // See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list
         // See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list
         // Temurin does not ship jmods, thus we need to use another JDK -- see https://github.com/actions/setup-java/issues/804
-        vendor = JvmVendorSpec.AZUL
+        // vendor = JvmVendorSpec.AZUL
     }
 }

jabgui/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.internal.os.OperatingSystem
 import org.javamodularity.moduleplugin.extensions.CompileModuleOptions
 import org.javamodularity.moduleplugin.extensions.RunModuleOptions
@@ -121,7 +122,10 @@ dependencies {
     testImplementation("org.testfx:testfx-core:4.0.16-alpha")
     testImplementation("org.testfx:testfx-junit5:4.0.16-alpha")
 
-    testImplementation("org.mockito:mockito-core:5.17.0")
+    testImplementation("org.mockito:mockito-core:5.17.0") {
+        exclude(group = "net.bytebuddy", module = "byte-buddy")
+    }
+    testImplementation("net.bytebuddy:byte-buddy:1.17.5")
 
     // recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
     testImplementation("org.wiremock:wiremock-standalone:3.12.1")
@@ -258,7 +262,34 @@ tasks.named("jlinkZip") {
 }
 
 tasks.register<Delete>("deleteInstallerTemp") {
-    delete(file("$buildDir/installer"))
+    delete(layout.buildDirectory.dir("installer"))
+}
+
+var jpackageResourceDir: String  = ""
+
+if (OperatingSystem.current().isWindows) {
+    jpackageResourceDir = "${layout.buildDirectory.get().asFile}/jpackage-resource-dir"
+
+    tasks.register<Copy>("copyJPackageResourceDir") {
+        from("${projectDir}/buildres/windows") {
+            include("JabRef-post-image.wsf")
+            filter(ReplaceTokens::class, mapOf("tokens" to mapOf(
+                "jabRefRoot" to project.projectDir.toString().replace('\\', '/')
+            )))
+        }
+        from("${projectDir}/buildres/windows") {
+            exclude("JabRef-post-image.wsf")
+        }
+        into(jpackageResourceDir)
+    }
+
+    tasks.named("jpackage").configure {
+        dependsOn("copyJPackageResourceDir")
+    }
+} else if (OperatingSystem.current().isLinux) {
+    jpackageResourceDir = "${projectDir}/buildres/linux"
+} else if (OperatingSystem.current().isMacOsX) {
+    jpackageResourceDir = "${projectDir}/buildres/mac"
 }
 
 jlink {
@@ -413,7 +444,7 @@ jlink {
         )
         requires(
             "org.tukaani.xz"
-        );
+        )
         uses(
             "ai.djl.engine.EngineProvider"
         )
@@ -496,8 +527,8 @@ jlink {
                     "--win-shortcut",
                     "--win-menu",
                     "--win-menu-group", "JabRef",
-                    "--temp", "$buildDir/installer",
-                    "--resource-dir", "$projectDir/buildres/windows",
+                    "--temp", "${layout.buildDirectory.get()}/installer",
+                    "--resource-dir", jpackageResourceDir,
                     "--license-file", "$projectDir/buildres/LICENSE_with_Privacy.md",
                     "--file-associations", "$projectDir/buildres/windows/bibtexAssociations.properties"
                 )
@@ -516,7 +547,7 @@ jlink {
                     "--vendor",  "JabRef",
                     "--app-version", "$version",
                     // "--temp", "$buildDir/installer",
-                    "--resource-dir", "$projectDir/buildres/linux",
+                    "--resource-dir", jpackageResourceDir,
                     "--linux-menu-group", "Office;",
                     "--linux-rpm-license-type", "MIT",
                     // "--license-file", "$projectDir/LICENSE.md",
@@ -543,7 +574,7 @@ jlink {
                     "--mac-package-name", "JabRef",
                     "--app-version", "$version",
                     "--file-associations", "$projectDir/buildres/mac/bibtexAssociations.properties",
-                    "--resource-dir", "$projectDir/buildres/mac"
+                    "--resource-dir", jpackageResourceDir
                 )
             )
         }

jabgui/buildres/windows/JabRef-post-image.wsf

@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<package>
+   <job id="postImage">
+    <script language="jscript">
+     <![CDATA[
+        var fileSystem = new ActiveXObject("Scripting.FileSystemObject");
+
+        // The script is invoked in the "image" folder and not in "config" for some reason
+        // DEBUG Output
+        // var shell = new ActiveXObject("WScript.Shell");
+        // shell.Popup(fileSystem.GetFolder("."));
+        var jabRefRoot = fileSystem.GetFolder('@jabRefRoot@');
+        // jpackage will run a copy of the script from the "config" directory.
+        var installerConfig = fileSystem.GetFile(WScript.ScriptFullName).ParentFolder;
+
+        WScript.Echo("jabRefRoot: " + jabRefRoot)
+        WScript.Echo("installerConfig: " + installerConfig)
+
+        // Copy additional installer resources
+        fileSystem.CopyFile(jabRefRoot + "/buildres/windows/JabRefTopBanner.bmp", installerConfig + "/JabRefTopBanner.bmp");
+
+        var wxsFilePath = installerConfig + "/main.wxs";
+        wxsFile = fileSystem.OpenTextFile(wxsFilePath, 1);
+        var contents = wxsFile.ReadAll();
+        wxsFile.Close();
+
+        // Add registry values for JabRef Browser Extension
+        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabRefBrowserEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-firefox.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-chrome.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Microsoft\\Edge\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-chrome.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\Extensions\\bifehkofibaamoeaopjglfkddgkijdlh\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://clients2.google.com/service/update2/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Wow6432Node\\Google\\Chrome\\Extensions\\bifehkofibaamoeaopjglfkddgkijdlh\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://clients2.google.com/service/update2/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Microsoft\\Edge\\Extensions\\pgkajmkfgbehiomipedjhoddkejohfna\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://edge.microsoft.com/extensionwebstorebase/v1/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Wow6432Node\\Microsoft\\Edge\\Extensions\\pgkajmkfgbehiomipedjhoddkejohfna\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://edge.microsoft.com/extensionwebstorebase/v1/crx\" /></RegistryKey></Component></DirectoryRef><Feature Id=\"BrowserExtension\" Level=\"1\"><ComponentRef Id=\"RegistryJabRefBrowserEntries\" /></Feature></Product>");
+
+        // Specify banner
+        contents = contents.replace("</Product>", "<WixVariable Id=\"WixUIBannerBmp\" Value=\"JabRefTopBanner.bmp\" /></Product>");
+        //contents = contents.replace("</Product>", "<WixVariable Id=\"WixUIDialogBmp\" Value=\"\" /></Product>");
+
+         wxsFile = fileSystem.OpenTextFile(wxsFilePath, 2, true);
+         wxsFile.Write(contents);
+         wxsFile.Close();
+     ]]>
+    </script>
+   </job>
+</package>

jabkit/build.gradle.kts

@@ -53,7 +53,10 @@ dependencies {
     implementation("org.apache.lucene:lucene-queryparser:${luceneVersion}")
 
     testImplementation(project(":test-support"))
-    testImplementation("org.mockito:mockito-core:5.17.0")
+    testImplementation("org.mockito:mockito-core:5.17.0") {
+        exclude(group = "net.bytebuddy", module = "byte-buddy")
+    }
+    testImplementation("net.bytebuddy:byte-buddy:1.17.5")
 }
 
 /*

jablib/build.gradle.kts

@@ -207,7 +207,10 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
     testImplementation("org.junit.platform:junit-platform-launcher:1.12.2")
 
-    testImplementation("org.mockito:mockito-core:5.17.0")
+    testImplementation("org.mockito:mockito-core:5.17.0") {
+        exclude(group = "net.bytebuddy", module = "byte-buddy")
+    }
+    testImplementation("net.bytebuddy:byte-buddy:1.17.5")
 
     testImplementation("org.xmlunit:xmlunit-core:2.10.0")
     testImplementation("org.xmlunit:xmlunit-matchers:2.10.0")

jabsrv/build.gradle.kts

@@ -72,7 +72,10 @@ dependencies {
         exclude(group = "org.antlr")
     }
 
-    testImplementation("org.mockito:mockito-core:5.17.0")
+    testImplementation("org.mockito:mockito-core:5.17.0") {
+        exclude(group = "net.bytebuddy", module = "byte-buddy")
+    }
+    testImplementation("net.bytebuddy:byte-buddy:1.17.5")
 }
 
 javafx {

test-support/build.gradle.kts

@@ -17,7 +17,11 @@ dependencies {
     implementation("org.apache.logging.log4j:log4j-to-slf4j:2.24.3")
 
     implementation("org.junit.jupiter:junit-jupiter-api:5.12.2")
-    implementation("org.mockito:mockito-core:5.17.0")
+
+    implementation("org.mockito:mockito-core:5.17.0") {
+        exclude(group = "net.bytebuddy", module = "byte-buddy")
+    }
+    implementation("net.bytebuddy:byte-buddy:1.17.5")
 
     implementation("org.jspecify:jspecify:1.0.0")
 }