Changeset 18225 in josm

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)

Location:

trunk

Files:

• .github/workflows/ant-test.yml (modified) (1 diff)
• .github/workflows/ant.yml (modified) (2 diffs)
• native/linux/latest/usr/bin/josm-latest (modified) (2 diffs)
• native/linux/tested/usr/bin/josm (modified) (2 diffs)
• native/windows/README.txt (modified) (1 diff)

trunk/.github/workflows/ant-test.yml

@@ -22 +22 @@
       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:

trunk/.github/workflows/ant.yml

@@ -4 +4 @@
   # ANT_HOME is also our ant version
   ANT_HOME: 'apache-ant-1.10.11'
-  JAVAFX_VERSION: '16'
+  JAVAFX_VERSION: '17'
 on:
   push:
@@ -72 +72 @@
       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 }}

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

trunk/native/linux/tested/usr/bin/josm

@@ -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

trunk/native/windows/README.txt

@@ -36 +36 @@
 --------------------------
 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