Skip to content

Commit 7bad446

Browse files
author
stoecker
committed
drop security manager argument line for Java 24
git-svn-id: https://josm.openstreetmap.de/svn/trunk@19377 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent b5cb62d commit 7bad446

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

build.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@
104104
<condition property="isJava19"><matches string="${ant.java.version}" pattern="19|[2-9][0-9]" /></condition>
105105
<!-- <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition> -->
106106
<condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
107+
<!-- <condition property="isJava22"><matches string="${ant.java.version}" pattern="2[2-9]|[3-9][0-9]" /></condition> -->
108+
<!-- <condition property="isJava23"><matches string="${ant.java.version}" pattern="2[3-9]|[3-9][0-9]" /></condition> -->
109+
<condition property="isJava24"><matches string="${ant.java.version}" pattern="2[4-9]|[3-9][0-9]" /></condition>
107110
<!-- Disable jacoco on Java 19+, see https://github.com/jacoco/jacoco/pull/1282 -->
108111
<condition property="coverageByDefault">
109112
<not>
@@ -463,7 +466,7 @@ Build-Date: ${build.tstamp}
463466
<jvmarg value="${jacocoagent@{testfamily}@{testITsuffix}}" if:set="jacocoagent@{testfamily}@{testITsuffix}" />
464467
<jvmarg value="-Dfile.encoding=UTF-8"/>
465468
<jvmarg value="-Djava.locale.providers=SPI,CLDR" />
466-
<jvmarg value="-Djava.security.manager=allow" if:set="isJava17" />
469+
<jvmarg value="-Djava.security.manager=allow" if:set="isJava17" unless:set="isJava24" />
467470
<jvmarg value="-javaagent:${test.dir}/lib/junit5-system-exit.jar" if:set="isJava17"/>
468471
<jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
469472
<jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>

0 commit comments

Comments
 (0)