Changeset 18225 in josm for trunk/native/linux/latest

Timestamp:

2021-09-15T00:16:42+02:00 (3 years ago)

Author:

Don-vip

Message:

see #20522 - Prefer Java 17 over everything else

also fixes #21325 (via JDK-8248904)

File:

• trunk/native/linux/latest/usr/bin/josm-latest (modified) (2 diffs)

trunk/native/linux/latest/usr/bin/josm-latest

@@ -16 +16 @@
 || 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 +28 @@
         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