java/dictionary-generator/nbproject/build-impl.xml
changeset 151 a9f1ba451247
parent 13 a5d7afd1b93a
     1.1 --- a/java/dictionary-generator/nbproject/build-impl.xml	Wed May 28 23:30:27 2014 +0200
     1.2 +++ b/java/dictionary-generator/nbproject/build-impl.xml	Mon Jun 22 21:59:38 2020 +0200
     1.3 @@ -46,14 +46,15 @@
     1.4          <property file="${user.properties.file}"/>
     1.5          <!-- The two properties below are usually overridden -->
     1.6          <!-- by the active platform. Just a fallback. -->
     1.7 -        <property name="default.javac.source" value="1.4"/>
     1.8 -        <property name="default.javac.target" value="1.4"/>
     1.9 +        <property name="default.javac.source" value="1.6"/>
    1.10 +        <property name="default.javac.target" value="1.6"/>
    1.11      </target>
    1.12      <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    1.13          <property file="nbproject/configs/${config}.properties"/>
    1.14          <property file="nbproject/project.properties"/>
    1.15      </target>
    1.16      <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    1.17 +        <property name="platform.java" value="${java.home}/bin/java"/>
    1.18          <available file="${manifest.file}" property="manifest.available"/>
    1.19          <condition property="splashscreen.available">
    1.20              <and>
    1.21 @@ -71,16 +72,20 @@
    1.22                  </not>
    1.23              </and>
    1.24          </condition>
    1.25 -        <condition property="manifest.available+main.class">
    1.26 +        <condition property="profile.available">
    1.27              <and>
    1.28 -                <isset property="manifest.available"/>
    1.29 -                <isset property="main.class.available"/>
    1.30 +                <isset property="javac.profile"/>
    1.31 +                <length length="0" string="${javac.profile}" when="greater"/>
    1.32 +                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
    1.33              </and>
    1.34          </condition>
    1.35          <condition property="do.archive">
    1.36 -            <not>
    1.37 -                <istrue value="${jar.archive.disabled}"/>
    1.38 -            </not>
    1.39 +            <or>
    1.40 +                <not>
    1.41 +                    <istrue value="${jar.archive.disabled}"/>
    1.42 +                </not>
    1.43 +                <istrue value="${not.archive.disabled}"/>
    1.44 +            </or>
    1.45          </condition>
    1.46          <condition property="do.mkdist">
    1.47              <and>
    1.48 @@ -91,12 +96,6 @@
    1.49                  </not>
    1.50              </and>
    1.51          </condition>
    1.52 -        <condition property="manifest.available+main.class+mkdist.available">
    1.53 -            <and>
    1.54 -                <istrue value="${manifest.available+main.class}"/>
    1.55 -                <isset property="do.mkdist"/>
    1.56 -            </and>
    1.57 -        </condition>
    1.58          <condition property="do.archive+manifest.available">
    1.59              <and>
    1.60                  <isset property="manifest.available"/>
    1.61 @@ -115,24 +114,12 @@
    1.62                  <istrue value="${do.archive}"/>
    1.63              </and>
    1.64          </condition>
    1.65 -        <condition property="do.archive+manifest.available+main.class">
    1.66 +        <condition property="do.archive+profile.available">
    1.67              <and>
    1.68 -                <istrue value="${manifest.available+main.class}"/>
    1.69 +                <isset property="profile.available"/>
    1.70                  <istrue value="${do.archive}"/>
    1.71              </and>
    1.72          </condition>
    1.73 -        <condition property="manifest.available-mkdist.available">
    1.74 -            <or>
    1.75 -                <istrue value="${manifest.available}"/>
    1.76 -                <isset property="do.mkdist"/>
    1.77 -            </or>
    1.78 -        </condition>
    1.79 -        <condition property="manifest.available+main.class-mkdist.available">
    1.80 -            <or>
    1.81 -                <istrue value="${manifest.available+main.class}"/>
    1.82 -                <isset property="do.mkdist"/>
    1.83 -            </or>
    1.84 -        </condition>
    1.85          <condition property="have.tests">
    1.86              <or>
    1.87                  <available file="${test.src.dir}"/>
    1.88 @@ -169,6 +156,7 @@
    1.89          <property name="application.args" value=""/>
    1.90          <property name="source.encoding" value="${file.encoding}"/>
    1.91          <property name="runtime.encoding" value="${source.encoding}"/>
    1.92 +        <property name="manifest.encoding" value="${source.encoding}"/>
    1.93          <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
    1.94              <and>
    1.95                  <isset property="javadoc.encoding"/>
    1.96 @@ -186,7 +174,15 @@
    1.97          </condition>
    1.98          <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
    1.99          <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
   1.100 -            <length length="0" string="${endorsed.classpath}" when="greater"/>
   1.101 +            <and>
   1.102 +                <isset property="endorsed.classpath"/>
   1.103 +                <not>
   1.104 +                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
   1.105 +                </not>
   1.106 +            </and>
   1.107 +        </condition>
   1.108 +        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
   1.109 +            <isset property="profile.available"/>
   1.110          </condition>
   1.111          <condition else="false" property="jdkBug6558476">
   1.112              <and>
   1.113 @@ -196,7 +192,12 @@
   1.114                  </not>
   1.115              </and>
   1.116          </condition>
   1.117 -        <property name="javac.fork" value="${jdkBug6558476}"/>
   1.118 +        <condition else="false" property="javac.fork">
   1.119 +            <or>
   1.120 +                <istrue value="${jdkBug6558476}"/>
   1.121 +                <istrue value="${javac.external.vm}"/>
   1.122 +            </or>
   1.123 +        </condition>
   1.124          <property name="jar.index" value="false"/>
   1.125          <property name="jar.index.metainf" value="${jar.index}"/>
   1.126          <property name="copylibs.rebase" value="true"/>
   1.127 @@ -222,6 +223,7 @@
   1.128          <condition else="" property="testng.debug.mode" value="-mixed">
   1.129              <istrue value="${junit+testng.available}"/>
   1.130          </condition>
   1.131 +        <property name="java.failonerror" value="true"/>
   1.132      </target>
   1.133      <target name="-post-init">
   1.134          <!-- Empty placeholder for easier customization. -->
   1.135 @@ -275,6 +277,7 @@
   1.136                          <path path="@{classpath}"/>
   1.137                      </classpath>
   1.138                      <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.139 +                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
   1.140                      <compilerarg line="${javac.compilerargs}"/>
   1.141                      <compilerarg value="-processorpath"/>
   1.142                      <compilerarg path="@{processorpath}:${empty.dir}"/>
   1.143 @@ -314,6 +317,7 @@
   1.144                          <path path="@{classpath}"/>
   1.145                      </classpath>
   1.146                      <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.147 +                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
   1.148                      <compilerarg line="${javac.compilerargs}"/>
   1.149                      <customize/>
   1.150                  </javac>
   1.151 @@ -446,7 +450,7 @@
   1.152                      </fileset>
   1.153                  </union>
   1.154                  <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
   1.155 -                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="dictionary-generator" testname="TestNG tests" workingDir="${work.dir}">
   1.156 +                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="dictionary-generator" testname="TestNG tests" workingDir="${work.dir}">
   1.157                      <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
   1.158                      <propertyset>
   1.159                          <propertyref prefix="test-sys-prop."/>
   1.160 @@ -696,7 +700,7 @@
   1.161              <sequential>
   1.162                  <property environment="env"/>
   1.163                  <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
   1.164 -                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
   1.165 +                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
   1.166                      <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.167                      <jvmarg value="${profiler.info.jvmargs.agent}"/>
   1.168                      <jvmarg line="${profiler.info.jvmargs}"/>
   1.169 @@ -771,7 +775,7 @@
   1.170              <attribute default="${debug.classpath}" name="classpath"/>
   1.171              <element name="customize" optional="true"/>
   1.172              <sequential>
   1.173 -                <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.174 +                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
   1.175                      <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.176                      <jvmarg line="${debug-args-line}"/>
   1.177                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.178 @@ -798,7 +802,7 @@
   1.179              <attribute default="jvm" name="jvm"/>
   1.180              <element name="customize" optional="true"/>
   1.181              <sequential>
   1.182 -                <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.183 +                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
   1.184                      <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.185                      <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   1.186                      <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   1.187 @@ -837,8 +841,8 @@
   1.188                      </chainedmapper>
   1.189                  </pathconvert>
   1.190                  <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.191 -                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.192 -                    <fileset dir="${build.classes.dir}"/>
   1.193 +                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.194 +                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
   1.195                      <manifest>
   1.196                          <attribute name="Class-Path" value="${jar.classpath}"/>
   1.197                          <customize/>
   1.198 @@ -849,8 +853,8 @@
   1.199      </target>
   1.200      <target name="-init-presetdef-jar">
   1.201          <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.202 -            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
   1.203 -                <j2seproject1:fileset dir="${build.classes.dir}"/>
   1.204 +            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
   1.205 +                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
   1.206              </jar>
   1.207          </presetdef>
   1.208      </target>
   1.209 @@ -966,65 +970,67 @@
   1.210          <!-- Empty placeholder for easier customization. -->
   1.211          <!-- You can override this target in the ../build.xml file. -->
   1.212      </target>
   1.213 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
   1.214 -        <j2seproject1:jar/>
   1.215 +    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
   1.216 +        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
   1.217 +        <touch file="${tmp.manifest.file}" verbose="false"/>
   1.218      </target>
   1.219 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
   1.220 -        <j2seproject1:jar manifest="${manifest.file}"/>
   1.221 +    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
   1.222 +        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
   1.223 +        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
   1.224      </target>
   1.225 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   1.226 -        <j2seproject1:jar manifest="${manifest.file}">
   1.227 -            <j2seproject1:manifest>
   1.228 -                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
   1.229 -            </j2seproject1:manifest>
   1.230 -        </j2seproject1:jar>
   1.231 +    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
   1.232 +        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
   1.233 +            <attribute name="Main-Class" value="${main.class}"/>
   1.234 +        </manifest>
   1.235 +    </target>
   1.236 +    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
   1.237 +        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
   1.238 +            <attribute name="Profile" value="${javac.profile}"/>
   1.239 +        </manifest>
   1.240 +    </target>
   1.241 +    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
   1.242 +        <basename file="${application.splash}" property="splashscreen.basename"/>
   1.243 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.244 +        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
   1.245 +        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
   1.246 +            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   1.247 +        </manifest>
   1.248 +    </target>
   1.249 +    <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.250 +        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
   1.251          <echo level="info">To run this application from the command line without Ant, try:</echo>
   1.252 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.253 +        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
   1.254 +    </target>
   1.255 +    <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.256 +        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
   1.257          <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.258          <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.259          <pathconvert property="run.classpath.with.dist.jar">
   1.260              <path path="${run.classpath}"/>
   1.261              <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
   1.262          </pathconvert>
   1.263 -        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
   1.264 +        <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.265 +            <isset property="main.class.available"/>
   1.266 +        </condition>
   1.267 +        <condition else="debug" property="jar.usage.level" value="info">
   1.268 +            <isset property="main.class.available"/>
   1.269 +        </condition>
   1.270 +        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
   1.271      </target>
   1.272 -    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
   1.273 -        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
   1.274 -        <touch file="${tmp.manifest.file}" verbose="false"/>
   1.275 -    </target>
   1.276 -    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
   1.277 -        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
   1.278 -        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
   1.279 -    </target>
   1.280 -    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
   1.281 -        <manifest file="${tmp.manifest.file}" mode="update">
   1.282 -            <attribute name="Main-Class" value="${main.class}"/>
   1.283 -        </manifest>
   1.284 -    </target>
   1.285 -    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
   1.286 -        <basename file="${application.splash}" property="splashscreen.basename"/>
   1.287 -        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.288 -        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
   1.289 -        <manifest file="${tmp.manifest.file}" mode="update">
   1.290 -            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   1.291 -        </manifest>
   1.292 -    </target>
   1.293 -    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
   1.294 -        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
   1.295 -        <echo level="info">To run this application from the command line without Ant, try:</echo>
   1.296 -        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.297 -        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
   1.298 -    </target>
   1.299 -    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
   1.300 +    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
   1.301          <delete>
   1.302              <fileset file="${tmp.manifest.file}"/>
   1.303          </delete>
   1.304      </target>
   1.305 -    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
   1.306 +    <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,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
   1.307 +    <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,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
   1.308      <target name="-post-jar">
   1.309          <!-- Empty placeholder for easier customization. -->
   1.310          <!-- You can override this target in the ../build.xml file. -->
   1.311      </target>
   1.312 -    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
   1.313 +    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
   1.314 +    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
   1.315      <!--
   1.316                  =================
   1.317                  EXECUTION SECTION
   1.318 @@ -1181,7 +1187,7 @@
   1.319      <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
   1.320          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.321          <startprofiler/>
   1.322 -        <antcal target="run-test-with-main"/>
   1.323 +        <antcall target="run-test-with-main"/>
   1.324      </target>
   1.325      <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
   1.326          <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
   1.327 @@ -1203,11 +1209,14 @@
   1.328                  </not>
   1.329              </and>
   1.330          </condition>
   1.331 -        <javadoc additionalparam="${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.332 +        <condition else="" property="bug5101868workaround" value="*.java">
   1.333 +            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
   1.334 +        </condition>
   1.335 +        <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.336              <classpath>
   1.337                  <path path="${javac.classpath}"/>
   1.338              </classpath>
   1.339 -            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
   1.340 +            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
   1.341                  <filename name="**/*.java"/>
   1.342              </fileset>
   1.343              <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.344 @@ -1281,7 +1290,7 @@
   1.345          <mkdir dir="${build.test.results.dir}"/>
   1.346      </target>
   1.347      <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
   1.348 -        <j2seproject3:test testincludes="**/*Test.java"/>
   1.349 +        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
   1.350      </target>
   1.351      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.352          <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>