Changeset 14071 in josm


Ignore:
Timestamp:
2018-08-01T21:31:44+02:00 (7 weeks ago)
Author:
Don-vip
Message:

fix #16290 - prefer openjdk-11 over openjdk-8; drop detection of Oracle runtimes

Location:
trunk/linux
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/linux/latest/DEBIAN/control

    r12397 r14071  
    66Priority: extra
    77Architecture: all
    8 Depends: openjdk-8-jre | java8-runtime,
     8Depends: openjdk-11-jre | openjdk-8-jre | java8-runtime,
    99         proj-data
    1010Recommends: openjfx
  • trunk/linux/latest/usr/bin/josm-latest

    r13700 r14071  
    1313if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
    1414        JAVA_CMDS="$JAVA_HOME/bin/java"
    15         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
    16         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
    17         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
    18         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
     15        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
     16        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
     17        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
     18        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    1919else
    2020        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
    21         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
    22         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
    23         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
    24         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
    2521fi
    2622
  • trunk/linux/tested/DEBIAN/control

    r12397 r14071  
    66Priority: extra
    77Architecture: all
    8 Depends: openjdk-8-jre | java8-runtime,
     8Depends: openjdk-11-jre | openjdk-8-jre | java8-runtime,
    99         proj-data
    1010Recommends: openjfx
  • trunk/linux/tested/usr/bin/josm

    r13700 r14071  
    1313if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
    1414        JAVA_CMDS="$JAVA_HOME/bin/java"
    15         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
    16         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
    17         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
    18         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
     15        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
     16        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
     17        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
     18        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
    1919else
    2020        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
    21         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
    22         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
    23         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
    24         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
    2521fi
    2622
Note: See TracChangeset for help on using the changeset viewer.