Changeset 19680 in josm for trunk/build.xml


Ignore:
Timestamp:
2026-11-10T08:48:57+01:00 (101 minutes ago)
Author:
stoecker
Message:

update to Java 17, see #17858

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r19674 r19680  
    1818    <target name="init-javaversions" description="Initialize Java version properties">
    1919        <!-- For Java specific stuff by version -->
    20         <!-- <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|[2-9][0-9]" /></condition> -->
    21         <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|[2-9][0-9]" /></condition>
    22         <!-- <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition> -->
    23         <!-- <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|[2-9][0-9]" /></condition> -->
    24         <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|[2-9][0-9]" /></condition>
    25         <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition>
    2620        <!-- <condition property="isJava18"><matches string="${ant.java.version}" pattern="1[8-9]|[2-9][0-9]" /></condition> -->
    2721        <condition property="isJava19"><matches string="${ant.java.version}" pattern="19|[2-9][0-9]" /></condition>
    … …  
    9892        <!-- When incrementing the minimum Java version, don't forget to update the Java versions users will update to
    9993             (PlatformHook#getJavaUrl, PlatformHook#startupSanityChecks and PlatformHook#warnSoonToBeUnsupportedJava) -->
    100         <property name="java.lang.version" value="11" />
     94        <property name="java.lang.version" value="17" />
    10195        <property name="test.headless" value="true" />
    10296        <property name="noErrorProne" value="false"/>
    … …  
    233227            includes="@{includes}" excludes="@{excludes}" destdir="@{destdir}" release="@{release}"
    234228            debug="@{debug}" includeantruntime="@{includeantruntime}" encoding="@{encoding}">
    235               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    236               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    237               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    238               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    239               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    240               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    241               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    242               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    243               <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
    244               <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" if:set="isJava16" unless:set="noErrorProne"/>
     229              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" unless:set="noErrorProne"/>
     230              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" unless:set="noErrorProne"/>
     231              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" unless:set="noErrorProne"/>
     232              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED" unless:set="noErrorProne"/>
     233              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" unless:set="noErrorProne"/>
     234              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" unless:set="noErrorProne"/>
     235              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"  unless:set="noErrorProne"/>
     236              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" unless:set="noErrorProne"/>
     237              <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" unless:set="noErrorProne"/>
     238              <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" unless:set="noErrorProne"/>
    245239              <compilerarg line="-XDcompilePolicy=simple"/>
    246240              <compilerarg value="-processorpath"/>
    … …  
    309303        <!-- JOSM -->
    310304        <call-javac-compile excludes="**/package-info.java,**/module-info.java,main/**" release="${java.lang.version}"/>
    311         <!-- Java 11 specific files (2018-09 LTS) -->
    312         <call-javac-compile-mrjar release="11"/>
    313305        <!-- Java 17 specific files (2021-09 LTS) -->
    314306        <call-javac-compile-mrjar release="17"/>
    … …  
    351343                linksource="true"
    352344                author="false">
    353             <link href="https://docs.oracle.com/en/java/javase/11/docs/api" />
     345            <link href="https://docs.oracle.com/en/java/javase/17/docs/api" />
    354346            <doctitle><![CDATA[<h2>
    355347                <img src="https://josm.openstreetmap.de/svn/trunk/nodist/images/logo/header.png" style="vertical-align: middle;" alt="JOSM">
    … …  
    357349            </h2>]]></doctitle>
    358350            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
    359             <!-- Disable HTML checking until we switch to Java13+, see https://bugs.openjdk.java.net/browse/JDK-8223552 -->
    360             <arg value="-Xdoclint:-html" if:set="isJava13" />
     351            <arg value="-Xdoclint:-html" />
    361352            <arg value="-html5" />
    362353            <arg value="--add-exports" unless:set="noJavaFX" />
    … …  
    479470                        <jvmarg value="-Dfile.encoding=UTF-8"/>
    480471                        <jvmarg value="-Djava.locale.providers=SPI,CLDR" />
    481                         <jvmarg value="-Djava.security.manager=allow" if:set="isJava17" unless:set="isJava24" />
    482                         <jvmarg value="-javaagent:${test.dir}/lib/junit5-system-exit.jar" if:set="isJava17"/>
     472                        <jvmarg value="-Djava.security.manager=allow" unless:set="isJava24" />
     473                        <jvmarg value="-javaagent:${test.dir}/lib/junit5-system-exit.jar" />
    483474                        <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
    484475                        <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
    … …  
    505496                        <sysproperty key="josm.test.data" value="${test.dir}/data"/>
    506497                        <sysproperty key="java.awt.headless" value="${test.headless}"/>
    507                         <sysproperty key="java.security.manager" value="allow" if:set="isJava17" unless:set="isJava24" />
     498                        <sysproperty key="java.security.manager" value="allow" unless:set="isJava24" />
    508499                        <sysproperty key="glass.platform" value="Monocle"/>
    509500                        <sysproperty key="monocle.platform" value="Headless"/>
    … …  
    10491040            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*'"/>
    10501041            <arg line="-dotoutput dots"/>
    1051             <arg line="--multi-release 11"/>
     1042            <arg line="--multi-release 17"/>
    10521043            <arg line="${jar-direct.files.string}" />
    10531044        </exec>
    … …  
    10641055        <exec executable="jdeps" dir="${modules.dir}">
    10651056            <arg line="-dotoutput dots"/>
    1066             <arg line="--multi-release 11"/>
     1057            <arg line="--multi-release 17"/>
    10671058            <arg line="${jar-all.files.string}" />
    10681059        </exec>
Note: See TracChangeset for help on using the changeset viewer.