netbeans: update project files
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sun, 06 Oct 2024 19:49:35 +0200
changeset 15683ce47a51825
parent 155 baa266cb2c46
child 157 7abf9048d38d
netbeans: update project files
java/dictionary-generator/nbproject/build-impl.xml
java/dictionary-generator/nbproject/genfiles.properties
java/dictionary-generator/nbproject/project.properties
     1.1 --- a/java/dictionary-generator/nbproject/build-impl.xml	Sun Oct 06 19:45:10 2024 +0200
     1.2 +++ b/java/dictionary-generator/nbproject/build-impl.xml	Sun Oct 06 19:49:35 2024 +0200
     1.3 @@ -19,7 +19,7 @@
     1.4    - cleanup
     1.5  
     1.6          -->
     1.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="dictionary-generator-impl">
     1.8 +<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="dictionary-generator-impl">
     1.9      <fail message="Please build using Ant 1.8.0 or higher.">
    1.10          <condition>
    1.11              <not>
    1.12 @@ -46,14 +46,79 @@
    1.13          <property file="${user.properties.file}"/>
    1.14          <!-- The two properties below are usually overridden -->
    1.15          <!-- by the active platform. Just a fallback. -->
    1.16 -        <property name="default.javac.source" value="1.6"/>
    1.17 -        <property name="default.javac.target" value="1.6"/>
    1.18 +        <property name="default.javac.source" value="1.8"/>
    1.19 +        <property name="default.javac.target" value="1.8"/>
    1.20      </target>
    1.21      <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    1.22          <property file="nbproject/configs/${config}.properties"/>
    1.23          <property file="nbproject/project.properties"/>
    1.24      </target>
    1.25 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    1.26 +    <target name="-init-modules-supported">
    1.27 +        <condition property="modules.supported.internal" value="true">
    1.28 +            <not>
    1.29 +                <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
    1.30 +            </not>
    1.31 +        </condition>
    1.32 +    </target>
    1.33 +    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
    1.34 +        <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
    1.35 +            <attribute name="property"/>
    1.36 +            <attribute name="sourcepath"/>
    1.37 +            <sequential>
    1.38 +                <loadresource property="@{property}" quiet="true">
    1.39 +                    <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
    1.40 +                    <filterchain>
    1.41 +                        <stripjavacomments/>
    1.42 +                        <linecontainsregexp>
    1.43 +                            <regexp pattern="module .* \{"/>
    1.44 +                        </linecontainsregexp>
    1.45 +                        <tokenfilter>
    1.46 +                            <linetokenizer/>
    1.47 +                            <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
    1.48 +                        </tokenfilter>
    1.49 +                        <striplinebreaks/>
    1.50 +                    </filterchain>
    1.51 +                </loadresource>
    1.52 +            </sequential>
    1.53 +        </macrodef>
    1.54 +    </target>
    1.55 +    <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
    1.56 +        <fail message="Java 9 support requires Ant 1.10.0 or higher.">
    1.57 +            <condition>
    1.58 +                <not>
    1.59 +                    <antversion atleast="1.10.0"/>
    1.60 +                </not>
    1.61 +            </condition>
    1.62 +        </fail>
    1.63 +        <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
    1.64 +        <condition property="named.module.internal">
    1.65 +            <and>
    1.66 +                <isset property="module.name"/>
    1.67 +                <length length="0" string="${module.name}" when="greater"/>
    1.68 +            </and>
    1.69 +        </condition>
    1.70 +        <condition property="unnamed.module.internal">
    1.71 +            <not>
    1.72 +                <isset property="named.module.internal"/>
    1.73 +            </not>
    1.74 +        </condition>
    1.75 +        <property name="javac.modulepath" value=""/>
    1.76 +        <property name="run.modulepath" value="${javac.modulepath}"/>
    1.77 +        <property name="module.build.classes.dir" value="${build.classes.dir}"/>
    1.78 +        <property name="debug.modulepath" value="${run.modulepath}"/>
    1.79 +        <property name="javac.upgrademodulepath" value=""/>
    1.80 +        <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
    1.81 +        <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
    1.82 +            <and>
    1.83 +                <isset property="javac.systemmodulepath"/>
    1.84 +                <length length="0" string="${javac.systemmodulepath}" when="greater"/>
    1.85 +            </and>
    1.86 +        </condition>
    1.87 +        <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
    1.88 +        <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
    1.89 +        <property name="module.name" value=""/>
    1.90 +    </target>
    1.91 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
    1.92          <property name="platform.java" value="${java.home}/bin/java"/>
    1.93          <available file="${manifest.file}" property="manifest.available"/>
    1.94          <condition property="splashscreen.available">
    1.95 @@ -76,7 +141,9 @@
    1.96              <and>
    1.97                  <isset property="javac.profile"/>
    1.98                  <length length="0" string="${javac.profile}" when="greater"/>
    1.99 -                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
   1.100 +                <not>
   1.101 +                    <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
   1.102 +                </not>
   1.103              </and>
   1.104          </condition>
   1.105          <condition property="do.archive">
   1.106 @@ -87,15 +154,6 @@
   1.107                  <istrue value="${not.archive.disabled}"/>
   1.108              </or>
   1.109          </condition>
   1.110 -        <condition property="do.mkdist">
   1.111 -            <and>
   1.112 -                <isset property="do.archive"/>
   1.113 -                <isset property="libs.CopyLibs.classpath"/>
   1.114 -                <not>
   1.115 -                    <istrue value="${mkdist.disabled}"/>
   1.116 -                </not>
   1.117 -            </and>
   1.118 -        </condition>
   1.119          <condition property="do.archive+manifest.available">
   1.120              <and>
   1.121                  <isset property="manifest.available"/>
   1.122 @@ -250,11 +308,80 @@
   1.123              </sequential>
   1.124          </macrodef>
   1.125      </target>
   1.126 -    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   1.127 +    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
   1.128          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.129              <attribute default="${src.dir}" name="srcdir"/>
   1.130              <attribute default="${build.classes.dir}" name="destdir"/>
   1.131              <attribute default="${javac.classpath}" name="classpath"/>
   1.132 +            <attribute default="${javac.modulepath}" name="modulepath"/>
   1.133 +            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
   1.134 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   1.135 +            <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
   1.136 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.137 +            <attribute default="${includes}" name="includes"/>
   1.138 +            <attribute default="${excludes}" name="excludes"/>
   1.139 +            <attribute default="${javac.debug}" name="debug"/>
   1.140 +            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
   1.141 +            <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
   1.142 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   1.143 +            <element name="customize" optional="true"/>
   1.144 +            <sequential>
   1.145 +                <condition property="warn.excludes.internal">
   1.146 +                    <and>
   1.147 +                        <isset property="named.module.internal"/>
   1.148 +                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
   1.149 +                    </and>
   1.150 +                </condition>
   1.151 +                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
   1.152 +                <property location="${build.dir}/empty" name="empty.dir"/>
   1.153 +                <mkdir dir="${empty.dir}"/>
   1.154 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   1.155 +                <condition property="processormodulepath.set">
   1.156 +                    <resourcecount count="0" when="greater">
   1.157 +                        <path>
   1.158 +                            <pathelement path="@{processormodulepath}"/>
   1.159 +                        </path>
   1.160 +                    </resourcecount>
   1.161 +                </condition>
   1.162 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
   1.163 +                    <src>
   1.164 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   1.165 +                            <include name="*"/>
   1.166 +                        </dirset>
   1.167 +                    </src>
   1.168 +                    <classpath>
   1.169 +                        <path path="@{classpath}"/>
   1.170 +                    </classpath>
   1.171 +                    <modulepath>
   1.172 +                        <path path="@{modulepath}"/>
   1.173 +                    </modulepath>
   1.174 +                    <upgrademodulepath>
   1.175 +                        <path path="@{upgrademodulepath}"/>
   1.176 +                    </upgrademodulepath>
   1.177 +                    <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
   1.178 +                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
   1.179 +                    <compilerarg line="${javac.compilerargs}"/>
   1.180 +                    <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
   1.181 +                    <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
   1.182 +                    <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
   1.183 +                    <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
   1.184 +                    <compilerarg line="${ap.processors.internal}"/>
   1.185 +                    <compilerarg line="${annotation.processing.processor.options}"/>
   1.186 +                    <compilerarg value="-s"/>
   1.187 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   1.188 +                    <compilerarg line="${ap.proc.none.internal}"/>
   1.189 +                    <customize/>
   1.190 +                </javac>
   1.191 +            </sequential>
   1.192 +        </macrodef>
   1.193 +    </target>
   1.194 +    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
   1.195 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.196 +            <attribute default="${src.dir}" name="srcdir"/>
   1.197 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.198 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.199 +            <attribute default="${javac.modulepath}" name="modulepath"/>
   1.200 +            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
   1.201              <attribute default="${javac.processorpath}" name="processorpath"/>
   1.202              <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.203              <attribute default="${includes}" name="includes"/>
   1.204 @@ -291,11 +418,13 @@
   1.205              </sequential>
   1.206          </macrodef>
   1.207      </target>
   1.208 -    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   1.209 +    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   1.210          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.211              <attribute default="${src.dir}" name="srcdir"/>
   1.212              <attribute default="${build.classes.dir}" name="destdir"/>
   1.213              <attribute default="${javac.classpath}" name="classpath"/>
   1.214 +            <attribute default="${javac.modulepath}" name="modulepath"/>
   1.215 +            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
   1.216              <attribute default="${javac.processorpath}" name="processorpath"/>
   1.217              <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.218              <attribute default="${includes}" name="includes"/>
   1.219 @@ -324,7 +453,7 @@
   1.220              </sequential>
   1.221          </macrodef>
   1.222      </target>
   1.223 -    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   1.224 +    <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   1.225          <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.226              <attribute default="${src.dir}" name="srcdir"/>
   1.227              <attribute default="${build.classes.dir}" name="destdir"/>
   1.228 @@ -379,7 +508,59 @@
   1.229          <property name="test.binarytestincludes" value=""/>
   1.230          <property name="test.binaryexcludes" value=""/>
   1.231      </target>
   1.232 -    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
   1.233 +    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
   1.234 +        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.235 +            <attribute default="${includes}" name="includes"/>
   1.236 +            <attribute default="${excludes}" name="excludes"/>
   1.237 +            <element name="customizePrototype" optional="true"/>
   1.238 +            <sequential>
   1.239 +                <property name="junit.forkmode" value="perTest"/>
   1.240 +                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.241 +                    <syspropertyset>
   1.242 +                        <propertyref prefix="test-sys-prop."/>
   1.243 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.244 +                    </syspropertyset>
   1.245 +                    <classpath>
   1.246 +                        <path path="${run.test.classpath}"/>
   1.247 +                    </classpath>
   1.248 +                    <modulepath>
   1.249 +                        <path path="${run.test.modulepath}"/>
   1.250 +                    </modulepath>
   1.251 +                    <formatter type="brief" usefile="false"/>
   1.252 +                    <formatter type="xml"/>
   1.253 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.254 +                    <jvmarg value="-ea"/>
   1.255 +                    <jvmarg line="${run.test.jvmargs}"/>
   1.256 +                    <customizePrototype/>
   1.257 +                </junit>
   1.258 +            </sequential>
   1.259 +        </macrodef>
   1.260 +    </target>
   1.261 +    <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
   1.262 +        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.263 +            <attribute default="${includes}" name="includes"/>
   1.264 +            <attribute default="${excludes}" name="excludes"/>
   1.265 +            <element name="customizePrototype" optional="true"/>
   1.266 +            <sequential>
   1.267 +                <property name="junit.forkmode" value="perTest"/>
   1.268 +                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.269 +                    <syspropertyset>
   1.270 +                        <propertyref prefix="test-sys-prop."/>
   1.271 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.272 +                    </syspropertyset>
   1.273 +                    <classpath>
   1.274 +                        <path path="${run.test.classpath}"/>
   1.275 +                    </classpath>
   1.276 +                    <formatter type="brief" usefile="false"/>
   1.277 +                    <formatter type="xml"/>
   1.278 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.279 +                    <jvmarg value="-ea"/>
   1.280 +                    <customizePrototype/>
   1.281 +                </junit>
   1.282 +            </sequential>
   1.283 +        </macrodef>
   1.284 +    </target>
   1.285 +    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
   1.286          <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.287              <attribute default="${includes}" name="includes"/>
   1.288              <attribute default="${excludes}" name="excludes"/>
   1.289 @@ -387,22 +568,16 @@
   1.290              <attribute default="" name="testmethods"/>
   1.291              <element name="customize" optional="true"/>
   1.292              <sequential>
   1.293 -                <property name="junit.forkmode" value="perTest"/>
   1.294 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.295 -                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
   1.296 -                    <syspropertyset>
   1.297 -                        <propertyref prefix="test-sys-prop."/>
   1.298 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.299 -                    </syspropertyset>
   1.300 -                    <formatter type="brief" usefile="false"/>
   1.301 -                    <formatter type="xml"/>
   1.302 -                    <jvmarg value="-ea"/>
   1.303 -                    <customize/>
   1.304 -                </junit>
   1.305 +                <j2seproject3:junit-prototype>
   1.306 +                    <customizePrototype>
   1.307 +                        <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
   1.308 +                        <customize/>
   1.309 +                    </customizePrototype>
   1.310 +                </j2seproject3:junit-prototype>
   1.311              </sequential>
   1.312          </macrodef>
   1.313      </target>
   1.314 -    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
   1.315 +    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
   1.316          <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.317              <attribute default="${includes}" name="includes"/>
   1.318              <attribute default="${excludes}" name="excludes"/>
   1.319 @@ -410,25 +585,19 @@
   1.320              <attribute default="" name="testmethods"/>
   1.321              <element name="customize" optional="true"/>
   1.322              <sequential>
   1.323 -                <property name="junit.forkmode" value="perTest"/>
   1.324 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.325 -                    <batchtest todir="${build.test.results.dir}">
   1.326 -                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.327 -                            <filename name="@{testincludes}"/>
   1.328 -                        </fileset>
   1.329 -                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
   1.330 -                            <filename name="${test.binarytestincludes}"/>
   1.331 -                        </fileset>
   1.332 -                    </batchtest>
   1.333 -                    <syspropertyset>
   1.334 -                        <propertyref prefix="test-sys-prop."/>
   1.335 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.336 -                    </syspropertyset>
   1.337 -                    <formatter type="brief" usefile="false"/>
   1.338 -                    <formatter type="xml"/>
   1.339 -                    <jvmarg value="-ea"/>
   1.340 -                    <customize/>
   1.341 -                </junit>
   1.342 +                <j2seproject3:junit-prototype>
   1.343 +                    <customizePrototype>
   1.344 +                        <batchtest todir="${build.test.results.dir}">
   1.345 +                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.346 +                                <filename name="@{testincludes}"/>
   1.347 +                            </fileset>
   1.348 +                            <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
   1.349 +                                <filename name="${test.binarytestincludes}"/>
   1.350 +                            </fileset>
   1.351 +                        </batchtest>
   1.352 +                        <customize/>
   1.353 +                    </customizePrototype>
   1.354 +                </j2seproject3:junit-prototype>
   1.355              </sequential>
   1.356          </macrodef>
   1.357      </target>
   1.358 @@ -456,6 +625,10 @@
   1.359                          <propertyref prefix="test-sys-prop."/>
   1.360                          <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.361                      </propertyset>
   1.362 +                    <classpath>
   1.363 +                        <path path="${run.test.classpath}"/>
   1.364 +                    </classpath>
   1.365 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.366                      <customize/>
   1.367                  </testng>
   1.368              </sequential>
   1.369 @@ -510,10 +683,6 @@
   1.370              <sequential>
   1.371                  <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.372                      <customize>
   1.373 -                        <classpath>
   1.374 -                            <path path="${run.test.classpath}"/>
   1.375 -                        </classpath>
   1.376 -                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.377                          <jvmarg line="${run.jvmargs}"/>
   1.378                          <jvmarg line="${run.jvmargs.ide}"/>
   1.379                      </customize>
   1.380 @@ -521,74 +690,20 @@
   1.381              </sequential>
   1.382          </macrodef>
   1.383      </target>
   1.384 -    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
   1.385 -        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.386 -            <attribute default="${includes}" name="includes"/>
   1.387 -            <attribute default="${excludes}" name="excludes"/>
   1.388 -            <attribute default="**" name="testincludes"/>
   1.389 -            <attribute default="" name="testmethods"/>
   1.390 -            <element name="customize" optional="true"/>
   1.391 -            <sequential>
   1.392 -                <property name="junit.forkmode" value="perTest"/>
   1.393 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.394 -                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
   1.395 -                    <syspropertyset>
   1.396 -                        <propertyref prefix="test-sys-prop."/>
   1.397 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.398 -                    </syspropertyset>
   1.399 -                    <formatter type="brief" usefile="false"/>
   1.400 -                    <formatter type="xml"/>
   1.401 -                    <jvmarg value="-ea"/>
   1.402 -                    <jvmarg line="${debug-args-line}"/>
   1.403 -                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.404 -                    <customize/>
   1.405 -                </junit>
   1.406 -            </sequential>
   1.407 -        </macrodef>
   1.408 -    </target>
   1.409 -    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
   1.410 -        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.411 -            <attribute default="${includes}" name="includes"/>
   1.412 -            <attribute default="${excludes}" name="excludes"/>
   1.413 -            <attribute default="**" name="testincludes"/>
   1.414 -            <attribute default="" name="testmethods"/>
   1.415 -            <element name="customize" optional="true"/>
   1.416 -            <sequential>
   1.417 -                <property name="junit.forkmode" value="perTest"/>
   1.418 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
   1.419 -                    <batchtest todir="${build.test.results.dir}">
   1.420 -                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.421 -                            <filename name="@{testincludes}"/>
   1.422 -                        </fileset>
   1.423 -                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
   1.424 -                            <filename name="${test.binarytestincludes}"/>
   1.425 -                        </fileset>
   1.426 -                    </batchtest>
   1.427 -                    <syspropertyset>
   1.428 -                        <propertyref prefix="test-sys-prop."/>
   1.429 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.430 -                    </syspropertyset>
   1.431 -                    <formatter type="brief" usefile="false"/>
   1.432 -                    <formatter type="xml"/>
   1.433 -                    <jvmarg value="-ea"/>
   1.434 -                    <jvmarg line="${debug-args-line}"/>
   1.435 -                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.436 -                    <customize/>
   1.437 -                </junit>
   1.438 -            </sequential>
   1.439 -        </macrodef>
   1.440 -    </target>
   1.441 -    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
   1.442 +    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
   1.443          <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.444              <attribute default="${includes}" name="includes"/>
   1.445              <attribute default="${excludes}" name="excludes"/>
   1.446              <attribute default="**" name="testincludes"/>
   1.447              <attribute default="" name="testmethods"/>
   1.448 -            <element implicit="true" name="customize" optional="true"/>
   1.449 +            <element name="customizeDebuggee" optional="true"/>
   1.450              <sequential>
   1.451 -                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.452 -                    <customize/>
   1.453 -                </j2seproject3:junit-debug>
   1.454 +                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.455 +                    <customize>
   1.456 +                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
   1.457 +                        <customizeDebuggee/>
   1.458 +                    </customize>
   1.459 +                </j2seproject3:junit>
   1.460              </sequential>
   1.461          </macrodef>
   1.462      </target>
   1.463 @@ -607,14 +722,14 @@
   1.464                  <delete dir="${build.test.results.dir}" quiet="true"/>
   1.465                  <mkdir dir="${build.test.results.dir}"/>
   1.466                  <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
   1.467 -                    <customize>
   1.468 +                    <customizeDebuggee>
   1.469                          <customize2/>
   1.470                          <jvmarg value="-ea"/>
   1.471                          <arg line="${testng.debug.mode}"/>
   1.472                          <arg line="-d ${build.test.results.dir}"/>
   1.473                          <arg line="-listener org.testng.reporters.VerboseReporter"/>
   1.474                          <arg line="${testng.cmd.args}"/>
   1.475 -                    </customize>
   1.476 +                    </customizeDebuggee>
   1.477                  </j2seproject3:debug>
   1.478              </sequential>
   1.479          </macrodef>
   1.480 @@ -641,14 +756,10 @@
   1.481              <attribute default="" name="testMethod"/>
   1.482              <sequential>
   1.483                  <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
   1.484 -                    <customize>
   1.485 -                        <classpath>
   1.486 -                            <path path="${run.test.classpath}"/>
   1.487 -                        </classpath>
   1.488 -                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.489 +                    <customizeDebuggee>
   1.490                          <jvmarg line="${run.jvmargs}"/>
   1.491                          <jvmarg line="${run.jvmargs.ide}"/>
   1.492 -                    </customize>
   1.493 +                    </customizeDebuggee>
   1.494                  </j2seproject3:test-debug-impl>
   1.495              </sequential>
   1.496          </macrodef>
   1.497 @@ -728,10 +839,14 @@
   1.498      <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
   1.499          <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.500              <attribute default="${main.class}" name="name"/>
   1.501 +            <attribute default="${debug.modulepath}" name="modulepath"/>
   1.502              <attribute default="${debug.classpath}" name="classpath"/>
   1.503              <attribute default="" name="stopclassname"/>
   1.504              <sequential>
   1.505                  <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
   1.506 +                    <modulepath>
   1.507 +                        <path path="@{modulepath}"/>
   1.508 +                    </modulepath>
   1.509                      <classpath>
   1.510                          <path path="@{classpath}"/>
   1.511                      </classpath>
   1.512 @@ -750,18 +865,6 @@
   1.513          </macrodef>
   1.514      </target>
   1.515      <target name="-init-debug-args">
   1.516 -        <property name="version-output" value="java version &quot;${ant.java.version}"/>
   1.517 -        <condition property="have-jdk-older-than-1.4">
   1.518 -            <or>
   1.519 -                <contains string="${version-output}" substring="java version &quot;1.0"/>
   1.520 -                <contains string="${version-output}" substring="java version &quot;1.1"/>
   1.521 -                <contains string="${version-output}" substring="java version &quot;1.2"/>
   1.522 -                <contains string="${version-output}" substring="java version &quot;1.3"/>
   1.523 -            </or>
   1.524 -        </condition>
   1.525 -        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
   1.526 -            <istrue value="${have-jdk-older-than-1.4}"/>
   1.527 -        </condition>
   1.528          <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
   1.529              <os family="windows"/>
   1.530          </condition>
   1.531 @@ -771,21 +874,46 @@
   1.532      </target>
   1.533      <target depends="-init-debug-args" name="-init-macrodef-debug">
   1.534          <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.535 +            <attribute default="${module.name}" name="modulename"/>
   1.536              <attribute default="${main.class}" name="classname"/>
   1.537 +            <attribute default="${debug.modulepath}" name="modulepath"/>
   1.538              <attribute default="${debug.classpath}" name="classpath"/>
   1.539 +            <element name="customizeDebuggee" optional="true"/>
   1.540 +            <sequential>
   1.541 +                <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
   1.542 +                    <customize>
   1.543 +                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
   1.544 +                        <customizeDebuggee/>
   1.545 +                    </customize>
   1.546 +                </j2seproject1:java>
   1.547 +            </sequential>
   1.548 +        </macrodef>
   1.549 +    </target>
   1.550 +    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
   1.551 +        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.552 +            <attribute default="${module.name}" name="modulename"/>
   1.553 +            <attribute default="${main.class}" name="classname"/>
   1.554 +            <attribute default="${run.modulepath}" name="modulepath"/>
   1.555 +            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
   1.556 +            <attribute default="${run.classpath}" name="classpath"/>
   1.557 +            <attribute default="jvm" name="jvm"/>
   1.558              <element name="customize" optional="true"/>
   1.559              <sequential>
   1.560 -                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
   1.561 -                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.562 -                    <jvmarg line="${debug-args-line}"/>
   1.563 -                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.564 +                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
   1.565 +                    <classpath>
   1.566 +                        <path path="@{classpath}"/>
   1.567 +                    </classpath>
   1.568 +                    <modulepath>
   1.569 +                        <pathelement path="@{modulepath}"/>
   1.570 +                        <pathelement location="${module.build.classes.dir}"/>
   1.571 +                    </modulepath>
   1.572 +                    <upgrademodulepath>
   1.573 +                        <path path="@{upgrademodulepath}"/>
   1.574 +                    </upgrademodulepath>
   1.575                      <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   1.576                      <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   1.577                      <jvmarg line="${run.jvmargs}"/>
   1.578                      <jvmarg line="${run.jvmargs.ide}"/>
   1.579 -                    <classpath>
   1.580 -                        <path path="@{classpath}"/>
   1.581 -                    </classpath>
   1.582                      <syspropertyset>
   1.583                          <propertyref prefix="run-sys-prop."/>
   1.584                          <mapper from="run-sys-prop.*" to="*" type="glob"/>
   1.585 @@ -795,9 +923,44 @@
   1.586              </sequential>
   1.587          </macrodef>
   1.588      </target>
   1.589 -    <target name="-init-macrodef-java">
   1.590 +    <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
   1.591          <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.592 +            <attribute default="" name="modulename"/>
   1.593              <attribute default="${main.class}" name="classname"/>
   1.594 +            <attribute default="${run.modulepath}" name="modulepath"/>
   1.595 +            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
   1.596 +            <attribute default="${run.classpath}" name="classpath"/>
   1.597 +            <attribute default="jvm" name="jvm"/>
   1.598 +            <element name="customize" optional="true"/>
   1.599 +            <sequential>
   1.600 +                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
   1.601 +                    <classpath>
   1.602 +                        <path path="@{classpath}"/>
   1.603 +                    </classpath>
   1.604 +                    <modulepath>
   1.605 +                        <path path="@{modulepath}"/>
   1.606 +                    </modulepath>
   1.607 +                    <upgrademodulepath>
   1.608 +                        <path path="@{upgrademodulepath}"/>
   1.609 +                    </upgrademodulepath>
   1.610 +                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   1.611 +                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   1.612 +                    <jvmarg line="${run.jvmargs}"/>
   1.613 +                    <jvmarg line="${run.jvmargs.ide}"/>
   1.614 +                    <syspropertyset>
   1.615 +                        <propertyref prefix="run-sys-prop."/>
   1.616 +                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
   1.617 +                    </syspropertyset>
   1.618 +                    <customize/>
   1.619 +                </java>
   1.620 +            </sequential>
   1.621 +        </macrodef>
   1.622 +    </target>
   1.623 +    <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
   1.624 +        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.625 +            <attribute default="" name="modulename"/>
   1.626 +            <attribute default="${main.class}" name="classname"/>
   1.627 +            <attribute default="" name="modulepath"/>
   1.628              <attribute default="${run.classpath}" name="classpath"/>
   1.629              <attribute default="jvm" name="jvm"/>
   1.630              <element name="customize" optional="true"/>
   1.631 @@ -820,6 +983,7 @@
   1.632              </sequential>
   1.633          </macrodef>
   1.634      </target>
   1.635 +    <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
   1.636      <target name="-init-macrodef-copylibs">
   1.637          <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.638              <attribute default="${manifest.file}" name="manifest"/>
   1.639 @@ -909,7 +1073,9 @@
   1.640          <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
   1.641      </target>
   1.642      <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
   1.643 -        <antcall target="clean"/>
   1.644 +        <antcall target="clean">
   1.645 +            <param name="no.dependencies" value="true"/>
   1.646 +        </antcall>
   1.647      </target>
   1.648      <target depends="init,deps-jar" name="-pre-pre-compile">
   1.649          <mkdir dir="${build.classes.dir}"/>
   1.650 @@ -950,7 +1116,7 @@
   1.651      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
   1.652          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.653          <j2seproject3:force-recompile/>
   1.654 -        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
   1.655 +        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
   1.656      </target>
   1.657      <target name="-post-compile-single">
   1.658          <!-- Empty placeholder for easier customization. -->
   1.659 @@ -970,6 +1136,25 @@
   1.660          <!-- Empty placeholder for easier customization. -->
   1.661          <!-- You can override this target in the ../build.xml file. -->
   1.662      </target>
   1.663 +    <target depends="init,compile" name="-check-module-main-class">
   1.664 +        <pathconvert property="main.class.file">
   1.665 +            <string value="${main.class}"/>
   1.666 +            <unpackagemapper from="*" to="*.class"/>
   1.667 +        </pathconvert>
   1.668 +        <condition property="do.module.main.class">
   1.669 +            <and>
   1.670 +                <isset property="main.class.available"/>
   1.671 +                <available file="${build.classes.dir}/module-info.class"/>
   1.672 +                <available file="${build.classes.dir}/${main.class.file}"/>
   1.673 +                <isset property="libs.CopyLibs.classpath"/>
   1.674 +                <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
   1.675 +            </and>
   1.676 +        </condition>
   1.677 +    </target>
   1.678 +    <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
   1.679 +        <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
   1.680 +        <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
   1.681 +    </target>
   1.682      <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
   1.683          <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
   1.684          <touch file="${tmp.manifest.file}" verbose="false"/>
   1.685 @@ -996,21 +1181,61 @@
   1.686              <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   1.687          </manifest>
   1.688      </target>
   1.689 -    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
   1.690 +    <target depends="init,compile" name="-check-do-mkdist">
   1.691 +        <condition property="do.mkdist">
   1.692 +            <and>
   1.693 +                <isset property="do.archive"/>
   1.694 +                <isset property="libs.CopyLibs.classpath"/>
   1.695 +                <not>
   1.696 +                    <istrue value="${mkdist.disabled}"/>
   1.697 +                </not>
   1.698 +                <not>
   1.699 +                    <available file="${build.classes.dir}/module-info.class"/>
   1.700 +                </not>
   1.701 +            </and>
   1.702 +        </condition>
   1.703 +    </target>
   1.704 +    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
   1.705          <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
   1.706          <echo level="info">To run this application from the command line without Ant, try:</echo>
   1.707          <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.708          <echo level="info">java -jar "${dist.jar.resolved}"</echo>
   1.709      </target>
   1.710 -    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
   1.711 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
   1.712          <j2seproject1:jar manifest="${tmp.manifest.file}"/>
   1.713          <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.714          <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.715 +        <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
   1.716 +            <isset property="named.module.internal"/>
   1.717 +        </condition>
   1.718          <pathconvert property="run.classpath.with.dist.jar">
   1.719              <path path="${run.classpath}"/>
   1.720 +            <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
   1.721 +        </pathconvert>
   1.722 +        <pathconvert property="run.modulepath.with.dist.jar">
   1.723 +            <path location="${dist.jar.resolved}"/>
   1.724 +            <path path="${run.modulepath}"/>
   1.725              <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
   1.726          </pathconvert>
   1.727 -        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
   1.728 +        <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
   1.729 +            <isset property="named.module.internal"/>
   1.730 +        </condition>
   1.731 +        <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
   1.732 +            <and>
   1.733 +                <isset property="modules.supported.internal"/>
   1.734 +                <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
   1.735 +            </and>
   1.736 +        </condition>
   1.737 +        <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
   1.738 +            <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
   1.739 +        </condition>
   1.740 +        <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
   1.741 +            <isset property="do.module.main.class"/>
   1.742 +        </condition>
   1.743 +        <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
   1.744 +            <isset property="named.module.internal"/>
   1.745 +        </condition>
   1.746 +        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
   1.747              <isset property="main.class.available"/>
   1.748          </condition>
   1.749          <condition else="debug" property="jar.usage.level" value="info">
   1.750 @@ -1029,8 +1254,73 @@
   1.751          <!-- Empty placeholder for easier customization. -->
   1.752          <!-- You can override this target in the ../build.xml file. -->
   1.753      </target>
   1.754 -    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
   1.755 -    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
   1.756 +    <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
   1.757 +    <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
   1.758 +    <!--
   1.759 +                =================
   1.760 +                DEPLOY SECTION
   1.761 +                =================
   1.762 +            -->
   1.763 +    <target name="-pre-deploy">
   1.764 +        <!-- Empty placeholder for easier customization. -->
   1.765 +        <!-- You can override this target in the ../build.xml file. -->
   1.766 +    </target>
   1.767 +    <target depends="init" name="-check-jlink">
   1.768 +        <condition property="do.jlink.internal">
   1.769 +            <and>
   1.770 +                <istrue value="${do.jlink}"/>
   1.771 +                <isset property="do.archive"/>
   1.772 +                <isset property="named.module.internal"/>
   1.773 +            </and>
   1.774 +        </condition>
   1.775 +    </target>
   1.776 +    <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
   1.777 +        <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
   1.778 +        <property name="jlink.launcher.name" value="${application.title}"/>
   1.779 +        <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
   1.780 +            <and>
   1.781 +                <isset property="jlink.additionalmodules"/>
   1.782 +                <length length="0" string="${jlink.additionalmodules}" when="greater"/>
   1.783 +            </and>
   1.784 +        </condition>
   1.785 +        <condition property="jlink.do.strip.internal">
   1.786 +            <and>
   1.787 +                <isset property="jlink.strip"/>
   1.788 +                <istrue value="${jlink.strip}"/>
   1.789 +            </and>
   1.790 +        </condition>
   1.791 +        <condition property="jlink.do.additionalparam.internal">
   1.792 +            <and>
   1.793 +                <isset property="jlink.additionalparam"/>
   1.794 +                <length length="0" string="${jlink.additionalparam}" when="greater"/>
   1.795 +            </and>
   1.796 +        </condition>
   1.797 +        <condition property="jlink.do.launcher.internal">
   1.798 +            <and>
   1.799 +                <istrue value="${jlink.launcher}"/>
   1.800 +                <isset property="main.class.available"/>
   1.801 +            </and>
   1.802 +        </condition>
   1.803 +        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
   1.804 +        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
   1.805 +        <exec executable="${platform.jlink}">
   1.806 +            <arg value="--module-path"/>
   1.807 +            <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
   1.808 +            <arg value="--add-modules"/>
   1.809 +            <arg value="${jlink.add.modules}"/>
   1.810 +            <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
   1.811 +            <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
   1.812 +            <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
   1.813 +            <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
   1.814 +            <arg value="--output"/>
   1.815 +            <arg value="${dist.jlink.output}"/>
   1.816 +        </exec>
   1.817 +    </target>
   1.818 +    <target name="-post-deploy">
   1.819 +        <!-- Empty placeholder for easier customization. -->
   1.820 +        <!-- You can override this target in the ../build.xml file. -->
   1.821 +    </target>
   1.822 +    <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
   1.823      <!--
   1.824                  =================
   1.825                  EXECUTION SECTION
   1.826 @@ -1067,9 +1357,9 @@
   1.827      </target>
   1.828      <target depends="init,compile" name="-debug-start-debuggee">
   1.829          <j2seproject3:debug>
   1.830 -            <customize>
   1.831 +            <customizeDebuggee>
   1.832                  <arg line="${application.args}"/>
   1.833 -            </customize>
   1.834 +            </customizeDebuggee>
   1.835          </j2seproject3:debug>
   1.836      </target>
   1.837      <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
   1.838 @@ -1135,28 +1425,24 @@
   1.839              </customize>
   1.840          </profile>
   1.841      </target>
   1.842 -    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
   1.843 +    <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
   1.844          <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
   1.845          <nbprofiledirect>
   1.846              <classpath>
   1.847                  <path path="${run.test.classpath}"/>
   1.848              </classpath>
   1.849          </nbprofiledirect>
   1.850 -        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
   1.851 -            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
   1.852 -            <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.853 -            <jvmarg line="${profiler.info.jvmargs}"/>
   1.854 -            <test name="${profile.class}"/>
   1.855 -            <classpath>
   1.856 -                <path path="${run.test.classpath}"/>
   1.857 -            </classpath>
   1.858 -            <syspropertyset>
   1.859 -                <propertyref prefix="test-sys-prop."/>
   1.860 -                <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.861 -            </syspropertyset>
   1.862 -            <formatter type="brief" usefile="false"/>
   1.863 -            <formatter type="xml"/>
   1.864 -        </junit>
   1.865 +        <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
   1.866 +            <customize>
   1.867 +                <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
   1.868 +                <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
   1.869 +                <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.870 +                <jvmarg line="${profiler.info.jvmargs}"/>
   1.871 +                <classpath>
   1.872 +                    <path path="${run.test.classpath}"/>
   1.873 +                </classpath>
   1.874 +            </customize>
   1.875 +        </j2seproject3:junit>
   1.876      </target>
   1.877      <!--
   1.878                  end of pre NB72 profiling section
   1.879 @@ -1212,6 +1498,12 @@
   1.880          <condition else="" property="bug5101868workaround" value="*.java">
   1.881              <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
   1.882          </condition>
   1.883 +        <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
   1.884 +            <and>
   1.885 +                <isset property="javadoc.html5"/>
   1.886 +                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
   1.887 +            </and>
   1.888 +        </condition>
   1.889          <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
   1.890              <classpath>
   1.891                  <path path="${javac.classpath}"/>
   1.892 @@ -1224,6 +1516,7 @@
   1.893                  <exclude name="*.java"/>
   1.894              </fileset>
   1.895              <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
   1.896 +            <arg line="${javadoc.html5.cmd.line.arg}"/>
   1.897          </javadoc>
   1.898          <copy todir="${dist.javadoc.dir}">
   1.899              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.900 @@ -1250,11 +1543,63 @@
   1.901          <!-- Empty placeholder for easier customization. -->
   1.902          <!-- You can override this target in the ../build.xml file. -->
   1.903      </target>
   1.904 +    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
   1.905 +        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
   1.906 +        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
   1.907 +            <and>
   1.908 +                <isset property="test.module.name"/>
   1.909 +                <length length="0" string="${test.module.name}" when="greater"/>
   1.910 +            </and>
   1.911 +        </condition>
   1.912 +        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
   1.913 +            <and>
   1.914 +                <isset property="test.module.name"/>
   1.915 +                <length length="0" string="${test.module.name}" when="greater"/>
   1.916 +            </and>
   1.917 +        </condition>
   1.918 +    </target>
   1.919 +    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
   1.920 +        <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
   1.921 +            <and>
   1.922 +                <isset property="test.module.name"/>
   1.923 +                <length length="0" string="${test.module.name}" when="greater"/>
   1.924 +            </and>
   1.925 +        </condition>
   1.926 +        <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
   1.927 +        <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
   1.928 +        <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
   1.929 +            <chainedmapper>
   1.930 +                <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
   1.931 +                <filtermapper>
   1.932 +                    <uniqfilter/>
   1.933 +                    <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
   1.934 +                </filtermapper>
   1.935 +                <cutdirsmapper dirs="1"/>
   1.936 +                <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
   1.937 +            </chainedmapper>
   1.938 +        </pathconvert>
   1.939 +        <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
   1.940 +            <and>
   1.941 +                <isset property="test.module.name"/>
   1.942 +                <length length="0" string="${test.module.name}" when="greater"/>
   1.943 +            </and>
   1.944 +        </condition>
   1.945 +    </target>
   1.946 +    <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
   1.947 +        <property name="javac.test.sourcepath" value="${empty.dir}"/>
   1.948 +        <property name="javac.test.compilerargs" value=""/>
   1.949 +        <property name="run.test.jvmargs" value=""/>
   1.950 +    </target>
   1.951 +    <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
   1.952      <target if="do.depend.true" name="-compile-test-depend">
   1.953          <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.954      </target>
   1.955 -    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.956 -        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
   1.957 +    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.958 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
   1.959 +            <customize>
   1.960 +                <compilerarg line="${javac.test.compilerargs}"/>
   1.961 +            </customize>
   1.962 +        </j2seproject3:javac>
   1.963          <copy todir="${build.test.classes.dir}">
   1.964              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.965          </copy>
   1.966 @@ -1268,10 +1613,14 @@
   1.967          <!-- Empty placeholder for easier customization. -->
   1.968          <!-- You can override this target in the ../build.xml file. -->
   1.969      </target>
   1.970 -    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.971 +    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.972          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.973          <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
   1.974 -        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.975 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
   1.976 +            <customize>
   1.977 +                <compilerarg line="${javac.test.compilerargs}"/>
   1.978 +            </customize>
   1.979 +        </j2seproject3:javac>
   1.980          <copy todir="${build.test.classes.dir}">
   1.981              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.982          </copy>
   1.983 @@ -1289,7 +1638,7 @@
   1.984      <target depends="init" if="have.tests" name="-pre-test-run">
   1.985          <mkdir dir="${build.test.results.dir}"/>
   1.986      </target>
   1.987 -    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
   1.988 +    <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
   1.989          <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
   1.990      </target>
   1.991      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.992 @@ -1301,14 +1650,14 @@
   1.993      <target depends="init" if="have.tests" name="-pre-test-run-single">
   1.994          <mkdir dir="${build.test.results.dir}"/>
   1.995      </target>
   1.996 -    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
   1.997 +    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
   1.998          <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
   1.999          <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
  1.1000      </target>
  1.1001      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
  1.1002          <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
  1.1003      </target>
  1.1004 -    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
  1.1005 +    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
  1.1006      <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
  1.1007          <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
  1.1008          <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
  1.1009 @@ -1317,7 +1666,7 @@
  1.1010      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
  1.1011          <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
  1.1012      </target>
  1.1013 -    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
  1.1014 +    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
  1.1015      <!--
  1.1016                  =======================
  1.1017                  TEST DEBUGGING SECTION
  1.1018 @@ -1335,8 +1684,9 @@
  1.1019      <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
  1.1020          <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
  1.1021      </target>
  1.1022 -    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
  1.1023 -    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
  1.1024 +    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
  1.1025 +    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
  1.1026 +    <target depends="debug-test-method" name="debug-single-method"/>
  1.1027      <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
  1.1028          <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
  1.1029      </target>
  1.1030 @@ -1362,9 +1712,9 @@
  1.1031      <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
  1.1032          <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
  1.1033          <j2seproject3:debug classname="sun.applet.AppletViewer">
  1.1034 -            <customize>
  1.1035 +            <customizeDebuggee>
  1.1036                  <arg value="${applet.url}"/>
  1.1037 -            </customize>
  1.1038 +            </customizeDebuggee>
  1.1039          </j2seproject3:debug>
  1.1040      </target>
  1.1041      <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
  1.1042 @@ -1391,6 +1741,7 @@
  1.1043      </target>
  1.1044      <target depends="init" name="-do-clean">
  1.1045          <delete dir="${build.dir}"/>
  1.1046 +        <delete dir="${dist.jlink.output}"/>
  1.1047          <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
  1.1048      </target>
  1.1049      <target name="-post-clean">
     2.1 --- a/java/dictionary-generator/nbproject/genfiles.properties	Sun Oct 06 19:45:10 2024 +0200
     2.2 +++ b/java/dictionary-generator/nbproject/genfiles.properties	Sun Oct 06 19:49:35 2024 +0200
     2.3 @@ -1,8 +1,8 @@
     2.4  build.xml.data.CRC32=0fb53d62
     2.5  build.xml.script.CRC32=37b2e9d9
     2.6 -build.xml.stylesheet.CRC32=8064a381@1.80.1.48
     2.7 +build.xml.stylesheet.CRC32=f85dc8f2@1.105.0.48
     2.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    2.10  nbproject/build-impl.xml.data.CRC32=0fb53d62
    2.11 -nbproject/build-impl.xml.script.CRC32=b1b0b76b
    2.12 -nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
    2.13 +nbproject/build-impl.xml.script.CRC32=c0601a59
    2.14 +nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.105.0.48
     3.1 --- a/java/dictionary-generator/nbproject/project.properties	Sun Oct 06 19:45:10 2024 +0200
     3.2 +++ b/java/dictionary-generator/nbproject/project.properties	Sun Oct 06 19:49:35 2024 +0200
     3.3 @@ -18,8 +18,12 @@
     3.4  #debug.transport=dt_socket
     3.5  debug.classpath=\
     3.6      ${run.classpath}
     3.7 +debug.modulepath=\
     3.8 +    ${run.modulepath}
     3.9  debug.test.classpath=\
    3.10      ${run.test.classpath}
    3.11 +debug.test.modulepath=\
    3.12 +    ${run.test.modulepath}
    3.13  # This directory is removed when the project is cleaned:
    3.14  dist.dir=dist
    3.15  dist.jar=${dist.dir}/dictionary-generator.jar
    3.16 @@ -31,6 +35,8 @@
    3.17  # Space-separated list of extra javac options
    3.18  javac.compilerargs=
    3.19  javac.deprecation=false
    3.20 +javac.modulepath=
    3.21 +javac.processormodulepath=
    3.22  javac.processorpath=\
    3.23      ${javac.classpath}
    3.24  javac.source=1.7
    3.25 @@ -38,6 +44,8 @@
    3.26  javac.test.classpath=\
    3.27      ${javac.classpath}:\
    3.28      ${build.classes.dir}
    3.29 +javac.test.modulepath=\
    3.30 +    ${javac.modulepath}
    3.31  javac.test.processorpath=\
    3.32      ${javac.test.classpath}
    3.33  javadoc.additionalparam=
    3.34 @@ -63,9 +71,13 @@
    3.35  # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
    3.36  # To set system properties for unit tests define test-sys-prop.name=value:
    3.37  run.jvmargs=
    3.38 +run.modulepath=\
    3.39 +    ${javac.modulepath}
    3.40  run.test.classpath=\
    3.41      ${javac.test.classpath}:\
    3.42      ${build.test.classes.dir}
    3.43 +run.test.modulepath=\
    3.44 +    ${javac.test.modulepath}
    3.45  source.encoding=UTF-8
    3.46  src.dir=src
    3.47  test.src.dir=test