Merge pull request #592 from slovensko-digital/fix-ubuntu-javafx-bug

celuchmarek · web-flow · commit c778c32099e0 · 2025-06-17T09:55:46.000+02:00
Fix ubuntu iconified blank state
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -18,15 +18,15 @@ jobs:
           apt-get -q update && apt-get -q upgrade -y
           apt-get -q install -y wget git gpg
 
-          wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.deb
-          apt-get -q install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.deb
+          wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.deb
+          apt-get -q install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.deb
           apt-get -q install -y binutils fakeroot
 
       - uses: actions/checkout@v4
 
       - name: Build artifact
         run: |
-          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java21-full)
+          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java24-full)
           export PATH=$JAVA_HOME/bin:$PATH
 
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -61,15 +61,15 @@ jobs:
           apt-get -q update && apt-get -q upgrade -y
           apt-get -q install -y wget git gpg
 
-          wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.deb
-          apt-get -q install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.deb
+          wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.deb
+          apt-get -q install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.deb
           apt-get -q install -y binutils fakeroot
 
       - uses: actions/checkout@v4
 
       - name: Build artifact
         run: |
-          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java21-full)
+          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java24-full)
           export PATH=$JAVA_HOME/bin:$PATH
 
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -102,14 +102,14 @@ jobs:
       - name: Setup dependencies
         run: |
           dnf -q install -y rpm-build git wget
-          wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.rpm
-          sudo yum install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.rpm
+          wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.rpm
+          sudo yum install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.rpm
 
       - uses: actions/checkout@v4
 
       - name: Build artifact
         run: |
-          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java21-full)
+          export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java24-full)
           export PATH=$JAVA_HOME/bin:$PATH
 
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
@@ -149,7 +149,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "21.0.7+9"
+          java-version: "24.0.1+11"
           distribution: "liberica"
           java-package: "jdk+fx"
 
@@ -238,7 +238,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "21.0.7+9"
+          java-version: "24.0.1+11"
           distribution: "liberica"
           java-package: "jdk+fx"
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '21.0.7+9'
+          java-version: '24.0.1+11'
           distribution: 'liberica'
           java-package: 'jdk+fx'
 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.run/Main.run.xml b/.run/Main.run.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Main" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="$PROJECT_DIR$/target/jdkCache/LIBERICA_jdk21.0.7+9_linux_amd64-full" />
+    <option name="ALTERNATIVE_JRE_PATH" value="$PROJECT_DIR$/target/jdkCache/LIBERICA_jdk24.0.1+11_linux_amd64-full" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="digital.slovensko.autogram.Main" />
     <module name="autogram" />
-    <option name="VM_PARAMETERS" value="--add-exports jdk.crypto.cryptoki/sun.security.pkcs11.wrapper=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="--add-exports jdk.crypto.cryptoki/sun.security.pkcs11.wrapper=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED --enable-native-access=javafx.graphics" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="digital.slovensko.autogram.ui.*" />
diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -73,7 +73,7 @@ Following is just overview of useful commands and
 
 ## Creating .app
 
-Using [jpackage](https://docs.oracle.com/en/java/javase/21/docs/specs/man/jpackage.html)
+Using [jpackage](https://docs.oracle.com/en/java/javase/24/docs/specs/man/jpackage.html)
 
 - `Autogram.entitlements` - entitlements default is [sanbox.plist](https://github.com/openjdk/jdk/blob/master/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/sandbox.plist) and we are removing audio recording permission
 - `Autogram-post-image.sh` - this script gets run during `jpackage` execution, between when "app-image" is prepared, but before packaging to pkg
diff --git a/README-SK.md b/README-SK.md
@@ -66,7 +66,7 @@ Pri podpisovaní cez API je potrebné nastaviť v body `parameters.fsFormId: "<i
 
 ### Predpoklady
 
-- JDK 21 s JavaFX (viď nižšie)
+- JDK 24 s JavaFX (viď nižšie)
 - Maven
 - Voliteľné: Visual Studio Code ako IDE alebo Intellij IDEA (stačí komunitná verzia).
 
@@ -90,13 +90,13 @@ Následne pomocou `jpackage` vytvorí všetky spustiteľné balíčky (.msi/.exe
 #### Debian/Ubuntu
 
 ```sh
-sudo apt install openjdk-21-jdk maven binutils rpm fakeroot
+sudo apt install openjdk-24-jdk maven binutils rpm fakeroot
 ```
 
 #### Fedora
 
 ```sh
-sudo dnf install java-21-openjdk maven rpm-build
+sudo dnf install java-24-openjdk maven rpm-build
 ```
 
 #### Linux Docker compose
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Adding more cards is relatively easy as long as they use PKCS#11.
 
 ### Prerequisites
 
-- JDK 21 with JavaFX (see below)
+- JDK 24 with JavaFX (see below)
 - Maven
 - Optional: Visual Studio Code as IDE or Intellij IDEA (community version is sufficient).
 
@@ -58,13 +58,13 @@ Then using `jpackage`, it creates all executable packages (.msi/.exe, .dmg/.pkg,
 #### Debian/Ubuntu
 
 ```sh
-sudo apt install openjdk-21-jdk maven binutils rpm fakeroot
+sudo apt install openjdk-24-jdk maven binutils rpm fakeroot
 ```
 
 #### Fedora
 
 ```sh
-sudo dnf install java-21-openjdk maven rpm-build
+sudo dnf install java-24-openjdk maven rpm-build
 ```
 
 #### Linux Docker compose
diff --git a/packaging/build.sh b/packaging/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd /app
-export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java21-full)
+export JAVA_HOME=/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep bellsoft-java24-full)
 export PATH=$JAVA_HOME/bin:$PATH
 ./mvnw versions:set -DnewVersion=${VERSION}
 ./mvnw -B -C -V package -P system-jdk
diff --git a/packaging/debian11.dockerfile b/packaging/debian11.dockerfile
@@ -3,8 +3,8 @@ FROM debian:11
 RUN apt-get -q update && apt-get -q upgrade -y
 RUN apt-get -q install -y wget git gpg
 
-RUN wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.deb
-RUN apt-get -q install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.deb
+RUN wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.deb
+RUN apt-get -q install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.deb
 RUN apt-get -q install -y binutils fakeroot
 
 COPY packaging/build.sh /build.sh
diff --git a/packaging/fedora41.dockerfile b/packaging/fedora41.dockerfile
@@ -1,8 +1,8 @@
 FROM fedora:41
 
 RUN dnf -q install -y rpm-build git wget
-RUN wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.rpm
-RUN sudo yum install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.rpm
+RUN wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.rpm
+RUN sudo yum install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.rpm
 
 COPY packaging/build.sh /build.sh
 RUN chmod +x /build.sh
diff --git a/packaging/ubuntu22.dockerfile b/packaging/ubuntu22.dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:22.04
 RUN apt-get -q update && apt-get -q upgrade -y
 RUN apt-get -q install -y wget git gpg
 
-RUN wget https://download.bell-sw.com/java/21.0.7+9/bellsoft-jdk21.0.7+9-linux-amd64-full.deb
-RUN apt-get -q install -y ./bellsoft-jdk21.0.7+9-linux-amd64-full.deb
+RUN wget https://download.bell-sw.com/java/24.0.1+11/bellsoft-jdk24.0.1+11-linux-amd64-full.deb
+RUN apt-get -q install -y ./bellsoft-jdk24.0.1+11-linux-amd64-full.deb
 RUN apt-get -q install -y binutils fakeroot
 
 COPY packaging/build.sh /build.sh
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.class>digital.slovensko.autogram.Main</main.class>
-        <java.version>21</java.version>
+        <java.version>24</java.version>
         <dss.version>6.2</dss.version>
         <gson.version>2.13.1</gson.version>
         <apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
@@ -309,7 +309,7 @@
                 <version>1.2.0</version>
                 <executions>
                     <execution>
-                        <id>cache-jdk-21</id>
+                        <id>cache-jdk-24</id>
                         <goals>
                             <goal>cache-jdk</goal>
                         </goals>
@@ -321,7 +321,7 @@
                             <provider>BELLSOFT</provider>
                             <providerConfig>
                                 <type>jdk</type>
-                                <version>21.0.7+9</version>
+                                <version>24.0.1+11</version>
                                 <arch>amd64-full</arch>
                             </providerConfig>
                         </configuration>
diff --git a/src/main/java/digital/slovensko/autogram/ui/gui/GUIUtils.java b/src/main/java/digital/slovensko/autogram/ui/gui/GUIUtils.java
@@ -17,8 +17,7 @@
 import java.io.StringWriter;
 
 public class GUIUtils {
-
-    private static Logger logger = LoggerFactory.getLogger(GUIUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(GUIUtils.class);
     static Parent loadFXML(Object controller, String fxml) {
         try {
             var loader = new FXMLLoader();
@@ -60,8 +59,14 @@ public static void closeWindow(Node node) {
     public static void startIconified(Stage stage) {
         if (OperatingSystem.current() == OperatingSystem.LINUX) {
             stage.setIconified(true);
+            stage.setOnShown((e) -> Platform.runLater(() -> {
+                // hack to force relayout because Ubuntu shows a blank scene for an unknown reason
+                // see https://github.com/openjdk/jfx/pull/1733
+                stage.setWidth(stage.getWidth());
+            }));
+
         } else {
-            // WINDOWS & MAC need to set iconified after showing primary stage, otherwise it starts blank
+            // WINDOWS & MAC need to set iconified after showing the primary stage, otherwise it starts blank
             stage.setOpacity(0); // prevents startup blink
             stage.setOnShown((e) -> Platform.runLater(() -> {
                 stage.setIconified(true);
diff --git a/src/main/resources/digital/slovensko/autogram/server/server.yml b/src/main/resources/digital/slovensko/autogram/server/server.yml
@@ -13,7 +13,7 @@ info:
   license:
     name: EUPL
     url: https://github.com/slovensko-digital/autogram/blob/main/LICENSE
-  version: 2.3.0
+  version: 2.4.1
 servers:
   - url: http://localhost:37200
   - url: /
diff --git a/src/main/scripts/package.sh b/src/main/scripts/package.sh
@@ -35,7 +35,8 @@ jvmOptions="-Dfile.encoding=UTF-8 \
     --add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED \
     --add-exports jdk.crypto.cryptoki/sun.security.pkcs11.wrapper=ALL-UNNAMED \
     --add-opens java.base/java.security=ALL-UNNAMED \
-    --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED"
+    --add-opens jdk.crypto.cryptoki/sun.security.pkcs11=ALL-UNNAMED \
+    --enable-native-access=javafx.graphics"
     
 arguments=(
     "--input" "${appDirectory}"
