Index: trunk/.github/workflows/ant-test.yml
===================================================================
--- trunk/.github/workflows/ant-test.yml	(revision 18224)
+++ trunk/.github/workflows/ant-test.yml	(revision 18225)
@@ -22,11 +22,6 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 16, 17-ea, 18-ea]
+        java: [8, 11, 17, 18-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
-        exclude:
-          - java: 8
-            os: macos-latest
-          - java: 11
-            os: macos-latest
     name: Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
Index: trunk/.github/workflows/ant.yml
===================================================================
--- trunk/.github/workflows/ant.yml	(revision 18224)
+++ trunk/.github/workflows/ant.yml	(revision 18225)
@@ -4,5 +4,5 @@
   # ANT_HOME is also our ant version
   ANT_HOME: 'apache-ant-1.10.11'
-  JAVAFX_VERSION: '16'
+  JAVAFX_VERSION: '17'
 on:
   push:
@@ -72,5 +72,5 @@
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 16, 17-ea, 18-ea]
+        java: [8, 11, 17, 18-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
     name: Java ${{ matrix.java }} on ${{ matrix.os }}
Index: trunk/native/linux/latest/usr/bin/josm-latest
===================================================================
--- trunk/native/linux/latest/usr/bin/josm-latest	(revision 18224)
+++ trunk/native/linux/latest/usr/bin/josm-latest	(revision 18225)
@@ -16,4 +16,5 @@
 || dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
 	# LTS versions in decreased order
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
@@ -27,5 +28,4 @@
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
 	# Development version(s)
-	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
 fi
Index: trunk/native/linux/tested/usr/bin/josm
===================================================================
--- trunk/native/linux/tested/usr/bin/josm	(revision 18224)
+++ trunk/native/linux/tested/usr/bin/josm	(revision 18225)
@@ -16,4 +16,5 @@
 || dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
 	# LTS versions in decreased order
+	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
@@ -27,5 +28,4 @@
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
 	# Development version(s)
-	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
 fi
Index: trunk/native/windows/README.txt
===================================================================
--- trunk/native/windows/README.txt	(revision 18224)
+++ trunk/native/windows/README.txt	(revision 18225)
@@ -36,5 +36,5 @@
 --------------------------
 See jpackage documentation to understand what it does and how it works:
-- https://docs.oracle.com/en/java/javase/16/jpackage/preface.html
+- https://docs.oracle.com/en/java/javase/17/jpackage/preface.html
 
 known issues
