Changeset 35963 in osm for applications/editors/josm

Timestamp:

2022-04-27T18:06:11+02:00 (2 years ago)

Author:

taylor.smock

Message:

build-common: Fix Java 18 builds for Java-EarlyAccess-JOSM-Plugins

File:

• applications/editors/josm/plugins/build-common.xml (modified) (3 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -64 +64 @@
     <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]" /></condition>
     <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]" /></condition>
-    <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="isJava20"><matches string="${ant.java.version}" pattern="2[0-9]" /></condition>
+    <!-- Disable jacoco on Java 20+ (Jacoco does not yet support Java 20+) -->
     <condition property="coverageByDefault">
         <not>
-            <isset property="isJava18"/>
+            <isset property="isJava20"/>
         </not>
     </condition>
@@ -612 +612 @@
                 <testclasses outputDir="${plugin.test.dir}/report">
                     <fileset dir="${plugin.test.dir}/build/unit" includes="**/*Test.class"/>
-                        <fork>
+                          <fork>
                         <jvmarg value="${jacocoagent}" if:set="jacocoagent" />
                         <jvmarg value="-Dfile.encoding=UTF-8"/>
                         <jvmarg value="-javaagent:${jmockit.jar}"/>
-                            <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
-                            <jvmarg value="-Djunit.jupiter.execution.parallel.enabled=true"/>
+                        <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
+                        <jvmarg value="-Djunit.jupiter.execution.parallel.enabled=true"/>
                         <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                         <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
@@ -631 +631 @@
                         <sysproperty key="java.awt.headless" value="true"/>
                         <sysproperty key="suppressPermanentFailure" value="${suppressPermanentFailure}"/>
-                            <sysproperty key="junit.jupiter.execution.parallel.enabled" value="${junit.jupiter.execution.parallel.enabled}" if:set="junit.jupiter.execution.parallel.enabled"/>
-                            <sysproperty key="junit.jupiter.execution.parallel.mode.default" value="${junit.jupiter.execution.parallel.mode.default}" if:set="junit.jupiter.execution.parallel.mode.default"/>
-                            <sysproperty key="junit.jupiter.execution.parallel.mode.classes.default" value="${junit.jupiter.execution.parallel.mode.classes.default}" if:set="junit.jupiter.execution.parallel.mode.classes.default"/>
-                        </fork>
+                        <sysproperty key="junit.jupiter.execution.parallel.enabled" value="${junit.jupiter.execution.parallel.enabled}" if:set="junit.jupiter.execution.parallel.enabled"/>
+                        <sysproperty key="junit.jupiter.execution.parallel.mode.default" value="${junit.jupiter.execution.parallel.mode.default}" if:set="junit.jupiter.execution.parallel.mode.default"/>
+                        <sysproperty key="junit.jupiter.execution.parallel.mode.classes.default" value="${junit.jupiter.execution.parallel.mode.classes.default}" if:set="junit.jupiter.execution.parallel.mode.classes.default"/>
+                    </fork>
                     <listener type="legacy-plain" />
                     <listener type="legacy-xml" />