Changeset 13505 in josm
- Timestamp:
- 2018-03-04T19:32:30+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r13494 r13505 9 9 ** 10 10 --> 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"> 12 12 <target name="init-properties"> 13 13 <!-- Load properties in a target and not at top level, so this build file can be … … 51 51 <condition property="isJava10"> 52 52 <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]" /> 53 57 </condition> 54 58 <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 --> … … 477 481 <junit printsummary="yes" fork="true" forkmode="once"> 478 482 <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" /> 481 485 <jvmarg value="--add-exports" if:set="isJava9" /> 482 486 <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
Note:
See TracChangeset
for help on using the changeset viewer.