Fetch dependencies using Ivy

.github/workflows/build.yaml

@@ -7,21 +7,17 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        java: [11]
+        java: [25]
         arch: [x86_64, aarch64, riscv64]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'liberica'
       - run: sudo apt-get install makeself
-      - if: ${{ matrix.arch == 'riscv64' }}
-        run: |
-          # TODO: remove after migrating to JDK21+
-          echo "ANT_ARGS=-Djlink.java.version=21.0.9+15" >> $GITHUB_ENV
       - run: ant -Dtarget.arch=${{ matrix.arch }} makeself
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: qz-tray-linux-${{ matrix.arch }}
           path: out/qz-tray-*.run
@@ -31,7 +27,8 @@ jobs:
           sudo apt-get install firefox chromium
           ant testng
           # Run policy tests again, but as root
-          sudo ant -Dtestng.pattern="**/policy/**" testng
+          # FIXME: Uncomment when fixed upstream https://github.com/actions/setup-java/issues/997
+          # sudo ant -Dtestng.pattern="**/policy/**" testng
           sudo DEBUG=true out/qz-tray-*.run
           /opt/qz-tray/qz-tray --version
           sudo apt-get install nsis
@@ -41,16 +38,16 @@ jobs:
     runs-on: [macos-latest]
     strategy:
       matrix:
-        java: [11]
+        java: [25]
         arch: [x86_64, aarch64]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'liberica'
       - run: ant -Dtarget.arch=${{ matrix.arch }} pkgbuild
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: qz-tray-macos-${{ matrix.arch }}
           path: out/qz-tray-*.pkg
@@ -61,7 +58,7 @@ jobs:
           ant testng
           # Run policy tests again, but as root
           sudo ant -Dtestng.pattern="**/policy/**" testng
-          sudo installer -pkg out/qz-tray-*.pkg -target /
+          sudo installer -pkg out/qz-tray-*.pkg -target / || (cat /tmp/qz-install.log && false)
           "/Applications/QZ Tray.app/Contents/MacOS/QZ Tray" --version
           brew install nsis makeself
           ant makeself
@@ -71,17 +68,17 @@ jobs:
     runs-on: [windows-latest]
     strategy:
       matrix:
-        java: [11]
+        java: [25]
         arch: [x86_64, aarch64]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'liberica'
       - run: choco install nsis
       - run: ant "-Dtarget.arch=${{ matrix.arch }}" nsis
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: qz-tray-windows-${{ matrix.arch }}
           path: out/qz-tray-*.exe

.gitignore

@@ -1,13 +1,17 @@
 /out/
 /js/node_modules
-/lib/javafx*
+/lib/*
+/deps/*
+!/deps/manual/
 /.idea/workspace.xml
 /.idea/misc.xml
 /.idea/uiDesigner.xml
 /.idea/compiler.xml
+/reports/
 /fx.zip
 /README.md
 /provision.json
 .DS_Store
 windows-debug-launcher.nsi.in
-/ant/private/qz.ks
+/ant/private/qz.ks
+/ant/deps/ivy

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11 as build
+FROM openjdk:25 as build
 RUN apt-get update
 RUN apt-get install -y ant nsis makeself
 COPY . /usr/src/tray

ant/apple/apple.properties

@@ -1,6 +1,4 @@
 # Apple build properties
 apple.packager.signid=P5DMU6659X
-# jdk9+ flags
-# - Tray icon requires workaround https://github.com/dyorgio/macos-tray-icon-fixer/issues/9
-# - Dark theme requires workaround https://github.com/bobbylight/Darcula/issues/8
-apple.launch.jigsaw=--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-exports java.desktop/com.apple.laf=ALL-UNNAMED
+# Apple launcher options
+apple.launch.opts=

ant/apple/installer.xml

@@ -324,6 +324,8 @@
                     <include name="**/darwin-aarch64/*" if="target.arch.aarch64"/> <!-- jna/hid4java -->
                     <include name="**/osx-aarch64/*" if="target.arch.aarch64"/> <!-- usb4java -->
                     <include name="**/osx_arm64/*" if="target.arch.aarch64"/> <!-- jssc -->
+                    <!--javafx-->
+                    <include name="*.dylib"/>
                 </fileset>
         </copy>
     </target>

ant/dependencies.properties

@@ -0,0 +1,132 @@
+# For renovate to be able to update version information
+# it needs the org and name to look up the latest rev
+
+#------------------------------#
+# Main app dependency versions #
+#------------------------------#
+bc.org=org.bouncycastle
+bc.name=bcprov-jdk18on
+bc.rev=1.84
+
+flatlaf.org=com.formdev
+flatlaf.name=flatlaf
+flatlaf.rev=3.7.1
+
+hid4java.org=org.hid4java
+hid4java.name=hid4java
+hid4java.rev=0.8.0
+
+icu4j.org=com.ibm.icu
+icu4j.name=icu4j
+icu4j.rev=78.3
+
+jai.org=com.github.jai-imageio
+jai.name=jai-imageio-core
+jai.rev=1.4.0
+
+javafx.org=org.openjfx
+javafx.name=javafx-base
+javafx.rev=27-ea+12
+
+semver.org=com.github.zafarkhaja
+semver.name=java-semver
+semver.rev=0.10.2
+
+jettison.org=org.codehaus.jettison
+jettison.name=jettison
+jettison.rev=1.5.5
+
+jbig2.org=org.apache.pdfbox
+jbig2.name=jbig2-imageio
+jbig2.rev=3.0.4
+
+jetty.org=org.eclipse.jetty
+jetty.name=jetty-server
+jetty.rev=10.0.26
+
+jna.org=net.java.dev.jna
+jna.name=jna-platform
+jna.rev=5.18.1
+
+jssc.org=io.github.java-native
+jssc.name=jssc
+jssc.rev=2.10.2
+
+libusb4java.org=org.usb4java
+libusb4java.name=libusb4java
+libusb4java.rev=1.2.0
+
+log4j.org=org.apache.logging.log4j
+log4j.name=log4j-core
+log4j.rev=2.25.4
+
+mslinks.org=org.jabref
+mslinks.name=mslinks
+mslinks.rev=1.1.1
+
+pdfbox.org=org.apache.pdfbox
+pdfbox.name=pdfbox
+pdfbox.rev=2.0.36
+
+purejavahidapi.org=nyholku
+purejavahidapi.name=purejavahidapi
+purejavahidapi.rev=0.0.10
+
+servlet-api.org=org.eclipse.jetty.toolchain
+servlet-api.name=jetty-servlet-api
+servlet-api.rev=4.0.9
+
+slf4j-nop.org=org.slf4j
+slf4j-nop.name=slf4j-nop
+slf4j-nop.rev=2.0.17
+
+twelvemonkeys.org=com.twelvemonkeys.imageio
+twelvemonkeys.name=imageio-core
+twelvemonkeys.rev=3.13.1
+
+usb-api.org=javax.usb
+usb-api.name=usb-api
+usb-api.rev=1.0.2
+
+usb4java.org=org.usb4java
+usb4java.name=usb4java
+usb4java.rev=1.3.0
+
+# TODO: Switch to jakarta org=jakarta.websocket, name=jakarta.websocket, rev=2.3.0-M2
+websocket-api.org=javax.websocket
+websocket-api.name=javax.websocket-api
+websocket-api.rev=1.1
+
+commons-codec.org=commons-codec
+commons-codec.name=commons-codec
+commons-codec.rev=1.21.0
+
+commons-io.org=commons-io
+commons-io.name=commons-io
+commons-io.rev=2.21.0
+
+commons-pool2.org=org.apache.commons
+commons-pool2.name=commons-pool2
+commons-pool2.rev=2.13.1
+
+commons-ssl.org=com.narupley
+commons-ssl.name=not-going-to-be-commons-ssl
+commons-ssl.rev=0.3.20
+
+#------------------------------#
+# Ant-only dependency versions #
+#------------------------------#
+jsign.org=net.jsign
+jsign.name=jsign
+jsign.rev=7.4
+
+testng.org=org.testng
+testng.name=testng
+testng.rev=7.12.0
+
+testng-ant.org=org.testng
+testng-ant.name=testng-ant
+testng-ant.rev=1.0.0
+
+# General configuration
+ivy.report.todir=${basedir}/reports

ant/deps/ivy-ant.xml

@@ -0,0 +1,9 @@
+<ivy-module version="2.0" xmlns:m="antlib:org.apache.ivy.ant">
+    <info organisation="io.qz" module="qz-tray-ant"/>
+    <dependencies>
+        <dependency name="${jsign.name}" org="${jsign.org}" conf="*->default" rev="${jsign.rev}"/>
+        <dependency name="${slf4j-nop.name}" org="${slf4j-nop.org}" conf="*->default" rev="${slf4j-nop.rev}"/>
+        <dependency name="${testng.name}" org="${testng.org}" conf="*->default" rev="${testng.rev}"/>
+        <dependency name="${testng-ant.name}" org="${testng-ant.org}" conf="*->default" rev="${testng-ant.rev}"/>
+    </dependencies>
+</ivy-module>

ant/ivy-settings.xml

@@ -0,0 +1,25 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+
+    <!-- These "magic lines" are pulled from: https://ant.apache.org/ivy/history/latest-milestone/tutorial/defaultconf.html -->
+    <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+    <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+    <resolvers>
+        <!-- Custom Repos here -->
+        <ibiblio name="gluonhq" m2compatible="true" root="https://nexus.gluonhq.com/nexus/content/repositories/releases/"/>
+    </resolvers>
+    <chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
+        <!-- These two are magic lines from the default conf -->
+        <resolver ref="local"/>
+        <resolver ref="main" />
+
+        <!-- Custom Repos here -->
+        <!-- <resolver ref="gluonhq" /> -->
+    </chain>
+    <modules>
+        <!-- <module organisation="org.openjfx" name=".*" resolver="gluonhq"/> -->
+    </modules>
+</ivysettings>