Changeset 19377 in josm for trunk/build.xml

Timestamp:

2025-04-02T18:49:37+02:00 (7 months ago)

Author:

stoecker

Message:

drop security manager argument line for Java 24

File:

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

trunk/build.xml

@@ -105 +105 @@
         <!-- <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition> -->
         <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
+        <!-- <condition property="isJava22"><matches string="${ant.java.version}" pattern="2[2-9]|[3-9][0-9]" /></condition> -->
+        <!-- <condition property="isJava23"><matches string="${ant.java.version}" pattern="2[3-9]|[3-9][0-9]" /></condition> -->
+        <condition property="isJava24"><matches string="${ant.java.version}" pattern="2[4-9]|[3-9][0-9]" /></condition>
         <!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
         <condition property="coverageByDefault">
@@ -464 +467 @@
                         <jvmarg value="-Dfile.encoding=UTF-8"/>
                         <jvmarg value="-Djava.locale.providers=SPI,CLDR" />
-                        <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" />
+                        <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" unless:set="isJava24" />
                         <jvmarg value="-javaagent:${test.dir}/lib/junit5-system-exit.jar" if:set="isJava17"/>
                         <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>