Enable JDK-EA builds again

.github/workflows/deployment.yml

@@ -93,11 +93,26 @@ jobs:
       - name: Run GitVersion
         id: gitversion
         uses: gittools/actions/gitversion/execute@v3.2.1
-      - name: Setup JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        if: (matrix.os != 'windows-latest')
+        shell: bash
+        # Hint by https://github.com/gradle/gradle/issues/29355#issuecomment-2598556970
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Make JDK known to gradle (Windows)
+        if: (matrix.os == 'windows-latest')
+        shell: bash
+        run: mv ~/AppData/Local/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: '24'
-          distribution: 'liberica'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Prepare merged jars and modules dir (macOS)
@@ -126,6 +141,8 @@ jobs:
           set -e
           cd jabgui
 
+          eval "$(mise hook-env)"
+
           # Use Java's packaging tool to create "JabRef.app"
           jpackage \
           --module org.jabref/org.jabref.Launcher \

.github/workflows/tests-fetchers.yml

@@ -52,11 +52,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run fetcher tests

.github/workflows/tests.yml

@@ -34,11 +34,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Run checkstyle reporter
         uses: dbelyaev/action-checkstyle@master
         with:
@@ -59,11 +68,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run OpenRewrite
@@ -79,11 +97,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run modernizer
@@ -178,11 +205,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run ${{ matrix.module }} tests
@@ -221,11 +257,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run tests on PostgreSQL
@@ -270,12 +315,20 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-      - name: Set up JDK
-        if: github.ref == 'refs/heads/main'
+
+      # region setup-JDK
+      - name: Setup JDK (to use in Gradle's Java toolchain)
+        uses: jdx/mise-action@v2
+      - name: Make JDK known to gradle (Linux, macOS)
+        shell: bash
+        run: ln -s ~/.local/share/mise ~/.asdf
+      - name: Setup JDK for gradle itself
         uses: actions/setup-java@v4
         with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'temurin'
+      # endregion
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Update test coverage metrics
@@ -302,11 +355,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           show-progress: 'false'
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 24.0.1
-          distribution: 'zulu'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew traceRequirements

.github/workflows/update-gradle-wrapper.yml

@@ -12,12 +12,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 24.0.1
-          distribution: 'zulu'
-
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v2
         with:

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)
@@ -45,10 +47,10 @@ java {
         // - .github/workflows/update-gradle-wrapper.yml
         // - docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md
         // - mise.toml
-        languageVersion = JavaLanguageVersion.of(24)
+        languageVersion = JavaLanguageVersion.of(25)
         // 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>