Changeset 13505 in josm


Ignore:
Timestamp:
2018-03-04T19:32:30+01:00 (9 months ago)
Author:
Don-vip
Message:

see #16047 - do not add EE modules with Java 11+

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r13494 r13505  
    99**
    1010-->
    11 <project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if">
     11<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless">
    1212    <target name="init-properties">
    1313        <!-- Load properties in a target and not at top level, so this build file can be
     
    5151        <condition property="isJava10">
    5252            <matches string="${ant.java.version}" pattern="1[0-9]" />
     53        </condition>
     54        <!-- For Java11-specific stuff -->
     55        <condition property="isJava11">
     56            <matches string="${ant.java.version}" pattern="1[1-9]" />
    5357        </condition>
    5458        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
     
    477481                <junit printsummary="yes" fork="true" forkmode="once">
    478482                    <jvmarg value="-Dfile.encoding=UTF-8"/>
    479                     <jvmarg value="--add-modules" if:set="isJava9" />
    480                     <jvmarg value="java.activation,java.se.ee" if:set="isJava9" />
     483                    <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
     484                    <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
    481485                    <jvmarg value="--add-exports" if:set="isJava9" />
    482486                    <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
Note: See TracChangeset for help on using the changeset viewer.