Changeset 18225 in josm


Ignore:
Timestamp:
2021-09-15T00:16:42+02:00 (11 months ago)
Author:
Don-vip
Message:

see #20522 - Prefer Java 17 over everything else

also fixes #21325 (via JDK-8248904)

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/.github/workflows/ant-test.yml

    r18029 r18225  
    2222      matrix:
    2323        # test against latest update of each major Java version, as well as specific updates of LTS versions:
    24         java: [8, 11, 16, 17-ea, 18-ea]
     24        java: [8, 11, 17, 18-ea]
    2525        os: [ubuntu-latest, macos-latest, windows-latest]
    26         exclude:
    27           - java: 8
    28             os: macos-latest
    29           - java: 11
    30             os: macos-latest
    3126    name: Java ${{ matrix.java }} on ${{ matrix.os }}
    3227    steps:
  • trunk/.github/workflows/ant.yml

    r18161 r18225  
    44  # ANT_HOME is also our ant version
    55  ANT_HOME: 'apache-ant-1.10.11'
    6   JAVAFX_VERSION: '16'
     6  JAVAFX_VERSION: '17'
    77on:
    88  push:
     
    7272      matrix:
    7373        # test against latest update of each major Java version, as well as specific updates of LTS versions:
    74         java: [8, 11, 16, 17-ea, 18-ea]
     74        java: [8, 11, 17, 18-ea]
    7575        os: [ubuntu-latest, macos-latest, windows-latest]
    7676    name: Java ${{ matrix.java }} on ${{ matrix.os }}
  • trunk/native/linux/latest/usr/bin/josm-latest

    r18171 r18225  
    1616|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
    1717        # LTS versions in decreased order
     18        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    1819        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
    1920        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
     
    2728        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    2829        # Development version(s)
    29         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    3030        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
    3131fi
  • trunk/native/linux/tested/usr/bin/josm

    r18171 r18225  
    1616|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
    1717        # LTS versions in decreased order
     18        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    1819        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
    1920        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
     
    2728        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    2829        # Development version(s)
    29         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
    3030        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
    3131fi
  • trunk/native/windows/README.txt

    r18165 r18225  
    3636--------------------------
    3737See jpackage documentation to understand what it does and how it works:
    38 - https://docs.oracle.com/en/java/javase/16/jpackage/preface.html
     38- https://docs.oracle.com/en/java/javase/17/jpackage/preface.html
    3939
    4040known issues
Note: See TracChangeset for help on using the changeset viewer.