Changeset 17538 in josm for trunk/build.xml

Timestamp:

2021-02-24T00:40:01+01:00 (3 years ago)

Author:

Don-vip

Message:

see #19724, see #20522 - enable jacoco on java 16/17 + add NPE details on Java 14+ in unit tests

File:

• trunk/build.xml (modified) (2 diffs)

trunk/build.xml

@@ -89 +89 @@
         <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
         <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
+        <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]" /></condition>
         <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]" /></condition>
-        <!-- Disable jacoco on Java 16+, see https://github.com/jacoco/jacoco/pull/992 -->
+        <condition property="isJava18"><matches string="${ant.java.version}" pattern="1[8-9]" /></condition>
+        <!-- Disable jacoco on Java 18+, see https://github.com/jacoco/jacoco/pull/1132 -->
         <condition property="coverageByDefault">
             <not>
-                <isset property="isJava16"/>
+                <isset property="isJava18"/>
             </not>
         </condition>
@@ -477 +479 @@
                             <jvmarg value="--add-opens" if:set="isJava9" />
                             <jvmarg value="java.desktop/java.awt=ALL-UNNAMED" if:set="isJava9" />
+                        <jvmarg value="-XX:+ShowCodeDetailsInExceptionMessages" if:set="isJava14" />
                             <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
                             <sysproperty key="josm.test.data" value="${test.dir}/data"/>