Changeset 12890 in josm


Ignore:
Timestamp:
2017-09-23T22:50:11+02:00 (3 months ago)
Author:
Don-vip
Message:

fix #15333, fix #15343: Java 9: fix problems with Web Start (jnlp) and plugin scripting

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r12875 r12890  
    455455                    <jvmarg value="-Dfile.encoding=UTF-8"/>
    456456                    <jvmarg value="--add-modules" if:set="isJava9" />
    457                     <jvmarg value="java.se.ee" if:set="isJava9" />
     457                    <jvmarg value="java.activation,java.se.ee" if:set="isJava9" />
    458458                    <jvmarg value="--add-exports" if:set="isJava9" />
    459459                    <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
  • trunk/josm-latest.jnlp

    r11927 r12890  
    2020    </security>
    2121    <resources>
    22         <java version="1.8+"/>
     22        <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED"/>
    2323        <jar href="josm-latest.jar"/>
    2424        <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
  • trunk/josm.jnlp

    r11927 r12890  
    2020    </security>
    2121    <resources>
    22         <java version="1.8+"/>
     22        <java version="1.8+" java-vm-args="--add-modules=java.activation,java.se.ee --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED"/>
    2323        <jar href="josm-tested.jar"/>
    2424        <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
  • trunk/linux/latest/usr/bin/josm-latest

    r12717 r12890  
    4848    echo "Using $JAVACMD to execute josm-latest." || true
    4949    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
    50         JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
     50        JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
    5151    fi
    5252    set +e
  • trunk/linux/tested/usr/bin/josm

    r12717 r12890  
    4848    echo "Using $JAVACMD to execute josm." || true
    4949    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
    50         JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
     50        JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
    5151    fi
    5252    set +e
Note: See TracChangeset for help on using the changeset viewer.