/[cvs]/jsr166/build.xml

Diff of /jsr166/build.xml

Parent Directory | Revision Log | View Patch Patch

-revision 1.205 by jsr166,
Sat Mar 26 17:35:47 2016 UTC
+revision 1.247 by jsr166,
Fri Jun 16 21:30:00 2017 UTC
 Line 1
  <project name="jsr166" default="usage"
-   xmlns:if="ant:if" xmlns:unless="ant:unless">
+   xmlns:if="ant:if" xmlns:unless="ant:unless"
+   xmlns:ivy="antlib:org.apache.ivy.ant">
    <description>
  ------------------------------------------------------------------------------
-Line 17
+Line 18
    itself.  Because the JDK version matters and because different
    targets require different JDKs, we assume that users have created a
    hierarchy containing:
-   $HOME/jdk/jdk6
-   $HOME/jdk/jdk7
    $HOME/jdk/jdk8
    $HOME/jdk/jdk9
+   $HOME/jdk/jdk10
    where each of the above is a JDK or a symlink to same, and
-   $HOME/jdk/src/jdk6
-   $HOME/jdk/src/jdk7
    $HOME/jdk/src/jdk8
    $HOME/jdk/src/jdk9
+   $HOME/jdk/src/jdk10
    where each of the above is a complete JDK source tree
    (e.g. mercurial forest) or a symlink to same.
    Alternatively, define ant variables thus:
    ant -Djdk$N.home=... -Djdk$N.src.home=...
-   for $N in 6 7 8 9 ...
+   for $N in 8 9 10 ...
-   As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
+   As of 2016-03, the sources in src/main are for jdk9+ only.
-   target is currently broken.
  ------------------------------------------------------------------------------
    </description>
-   <!-- Display main targets by running 'ant -projecthelp' -->
+   <!-- Run 'ant -projecthelp' (default target) -->
    <target name="usage">
      <java classname="org.apache.tools.ant.Main">
        <arg value="-projecthelp" />
-Line 63
+Line 61
    <property name="build.classes.dir"           location="${build.dir}/classes"/>
    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
    <property name="build.loops.dir"             location="${build.dir}/loops"/>
-   <property name="build.reports.dir"           location="${build.dir}/reports"/>
    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
-Line 134
+Line 131
    <defjdklocations v="7"/>
    <defjdklocations v="8"/>
    <defjdklocations v="9"/>
+   <defjdklocations v="10"/>
    <!-- Source locations -->
    <property name="src.dir"              location="${basedir}/src/main"/>
-Line 143
+Line 141
    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
+   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
    <property name="lib.dir"              location="${basedir}/lib"/>
    <property name="dist.dir"             location="${basedir}/dist"/>
-Line 186
+Line 185
    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-   <!-- The expected canonical location does not yet exist as of 2016-03 -->
+   <!-- The expected canonical location does not yet exist as of 2016-04 -->
    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-   <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
+   <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
    <!-- Default jdk doc location (latest stable release seems best) -->
    <property name="java.docroot.url"       value="${java8.docroot.url}"/>
-Line 233
+Line 232
        <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
      </condition>
+     <local name="use-doclint"/>
+     <condition property="use-doclint">
+       <not> <equals arg1="@{target}" arg2="7"/> </not>
+     </condition>
      <mkdir dir="@{workdir}/tck-classes"/>
      <javac srcdir="@{tck.src.dir}"
-Line 245
+Line 249
             classpath="${junit.jar}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac@{compile-target}}"
             fork="true">
        <include name="*.java"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
+       <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-       <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+       <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
        <compilerarg line="${build.args}"/>
        <javac-elements/>
-Line 263
+Line 269
            jvm="${java@{target}}"
            fork="true">
          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-         <jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+         <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
+         <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
+         <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
+         <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
+         <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
+         <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
          <jvmarg line="@{jvmflags}"/>
+         <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
+         <jvmarg line="${vmoptions}" if:set="vmoptions"/>
          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
          <syspropertyset id="system-properties-used-by-tck">
            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
            <propertyref prefix="jsr166."/>
-Line 283
+Line 296
    </macrodef>
    <!-- Define jtreg test sets for different jdk versions -->
+   <fileset dir="${jtreg10.src.dir}">
+     <patternset id="jdk10.jtreg.tests">
+       <include name="**/*.java"/>
+     </patternset>
+   </fileset>
    <fileset dir="${jtreg9.src.dir}">
      <patternset id="jdk9.jtreg.tests">
        <include name="**/*.java"/>
-Line 292
+Line 311
    <fileset dir="${jtreg8.src.dir}">
      <patternset id="jdk8.jtreg.tests">
        <include name="**/*.java"/>
-       <exclude name="**/SpliteratorCharacteristics.java"/>
-       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
-       <exclude name="**/GCDuringIteration.java"/>
      </patternset>
    </fileset>
-Line 309
+Line 325
    <macrodef name="run-jtreg-tests">
      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
-     <attribute name="source" default="7"/>
      <attribute name="target"/>
      <attribute name="workdir"/>
      <attribute name="classes"/>
-Line 326
+Line 341
      </condition>
      <delete dir="@{workdir}/JTwork"   quiet="true"/>
-     <delete dir="@{workdir}/JTreport" quiet="true"/>
-     <mkdir dir="@{workdir}/JTwork/scratch"/>
-     <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
-     <mkdir dir="@{workdir}/JTreport/html"/>
-     <mkdir dir="@{workdir}/JTreport/text"/>
      <jtreg dir="${jtreg@{target}.src.dir}"
             jdk="${jdk@{target}.home}"
-            workDir="@{workdir}/JTwork"
+            workDir="@{workdir}/JTwork">
-            reportDir="@{workdir}/JTreport">
        <patternset refid="jdk@{target}.jtreg.tests"/>
        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-       <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+       <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+       <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
        <arg value="-agentvm"/>
+       <arg value="-noreport"/>
        <arg value="-verbose:${jtreg.verbose}"/>
        <arg value="-vmoptions:-esa -ea"/>
        <arg value="-automatic"/>
-Line 361
+Line 372
    <!-- Main targets -->
    <property name="build.main.java.version" value="9"/>
-   <property name="build.main.javac" value="${javac9}"/>
+   <!-- Workaround "no nested properties in ant" -->
+   <macrodef name="define-build-main-properties">
+     <attribute name="v"/>
+     <sequential>
+       <property name="build.main.java"    value="${java@{v}}"/>
+       <property name="build.main.javac"   value="${javac@{v}}"/>
+       <property name="build.main.javadoc" value="${javadoc@{v}}"/>
+     </sequential>
+   </macrodef>
+   <define-build-main-properties v="${build.main.java.version}"/>
    <target name="dists"
-           depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+           depends="dist, 4jdk8dist"
            description="Builds all public jars and docs"/>
+           <!--
+               depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+           -->
    <target name="compile"
            depends="configure-compiler"
            description="Compiles src/main sources to build dir">
-     <local name="modules"/>
-     <condition property="modules">
-       <and>
-         <available file="${jdk9.home}/jmods" type="dir"/>
-         <equals arg1="9" arg2="${build.main.java.version}"/>
-       </and>
-     </condition>
      <local name="destdir"/>
-     <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
+     <property name="destdir" value="${build.classes.dir}/java.base"/>
-     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
      <mkdir dir="${destdir}"/>
-Line 393
+Line 407
             classpath=""
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${build.main.javac}"
             fork="true">
        <include name="**/*.java"/>
-       <compilerarg value="-Xmodule:java.base" if:set="modules"/>
+       <compilerarg value="--patch-module=java.base=${src.dir}"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
+       <compilerarg line="--doclint-format html5"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
        <compilerarg value="-Werror"/>
-       <compilerarg value="-Xdoclint:all/protected"/>
        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
        <compilerarg line="${build.args}"/>
-Line 413
+Line 429
    <target name="jar"
            depends="compile"
            description="Builds library jar for src/main from compiled sources">
+     <local name="subdir"/>
+     <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
      <jar destfile="${product.jar}">
-       <fileset dir="${build.classes.dir}"/>
+       <fileset dir="${build.classes.dir}${subdir}"/>
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
-Line 433
+Line 450
      <!-- the packagenames="none" hack below prevents scanning the -->
      <!-- sourcepath for packages -->
+ <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
+ <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
+ <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
+ <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
+ <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
      <javadoc destdir="${docs.dir}"
               packagenames="none"
               link="${java9.api.url}"
               overview="${src.dir}/intro.html"
               access="${build.javadoc.access}"
-              sourcepath="${src.dir}:${jdk9.src.dir}"
+              sourcepath="${src.dir}"
               classpath=""
-              executable="${javadoc9}">
+              source="9"
+              executable="${build.main.javadoc}">
        <fileset dir="${src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
        <arg line="-Xdocrootparent ${java9.docroot.url}"/>
        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
        <arg value="-XDignore.symbol.file=true"/>
- <!--  TODO     <arg value="-Xmodule:java.base"/> -->
+       <arg value="-html5"/>
+       <arg value="--patch-module=java.base=${src.dir}"/>
        <arg value="-tag"/>
        <arg value="${javadoc.jls.option}"/>
+ <!-- @apiNote currently unused -->
+ <!--       <arg value="-tag"/> -->
+ <!--       <arg value="apiNote:a:API Note:"/> -->
        <arg value="-tag"/>
-       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+       <arg value="implSpec:a:Implementation Requirements:"/>
-       <arg value="-tag"/>
-       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
-       <arg value="-tag"/>
-       <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
- <!-- tags added in jdk9 -->
-       <arg value="-tag"/>
-       <arg value="revised:X"/>
        <arg value="-tag"/>
-       <arg value="spec:X"/>
+       <arg value="implNote:a:Implementation Note:"/>
+ <!-- tags added in jdk9: currently unused -->
+ <!--       <arg value="-tag"/> -->
+ <!--       <arg value="revised:X"/> -->
+ <!--       <arg value="-tag"/> -->
+ <!--       <arg value="spec:X"/> -->
      </javadoc>
    </target>
-Line 494
+Line 519
    <target name="clean"
            description="Removes all build products">
      <delete dir="${build.dir}"/>
    </target>
    <target name="dist-clean"
            description="Removes all build and distribution products">
      <delete dir="${build.dir}"/>
      <delete dir="${dist.dir}"/>
    </target>
-Line 526
+Line 547
      <run-tck-tests
        target="${build.main.java.version}"
        workdir="${build.dir}"
-       classes="${product.jar}"/>
+       classes="${product.jar}">
+       <javac-elements>
+         <compilerarg value="-Werror"/>
+       </javac-elements>
+     </run-tck-tests>
    </target>
    <target name="tck-parallelism-1"
-           description="Runs tck with given common pool parallelism">
+           description="Runs tck with common pool parallelism 1">
      <antcall target="tck">
        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
      </antcall>
    </target>
    <target name="tck-parallelism-0"
-           description="Runs tck with given common pool parallelism">
+           description="Runs tck with common pool parallelism 0">
      <antcall target="tck">
        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
      </antcall>
    </target>
+   <target name="tck-security-manager"
+           description="Runs tck with a security manager">
+     <antcall target="tck">
+       <param name="jsr166.useSecurityManager" value="true"/>
+     </antcall>
+   </target>
    <target name="jtreg"
            depends="jar"
            description="Runs jtreg tests for src/main using the jtreg ant task">
-Line 553
+Line 585
    </target>
    <target name="test"
-           depends="tck, tck-parallelism-1, jtreg"
+           depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
-           description="Runs tck and jtreg tests for src/main">
+           description="Runs tck and jtreg tests for src/main"/>
-   </target>
  <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
-Line 587
+Line 618
    <target name="configure-compiler">
      <fail message="ant version too old">
-       <condition>
+       <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
-         <not> <antversion atleast="1.9.1"/> </not>
-       </condition>
      </fail>
      <property name="unchecked.option" value="-Xlint:unchecked"/>
-Line 623
+Line 652
        deprecation="${build.deprecation}"
             source="${build.sourcelevel}"
             target="${build.sourcelevel}"
+          encoding="ASCII"
               fork="true">
        <compilerarg line="${build.args}"/>
-Line 634
+Line 664
      <java classname="ALoops" fork="true">
        <classpath refid="loops.classpath"/>
      </java>
    </target>
    <target name="compile-test-loops" depends="jar"
-           description="compile all the perf tests in src/test/loops">
+           description="Compiles all the perf tests in src/test/loops">
      <mkdir dir="${build.dir}/test/loops"/>
-Line 650
+Line 679
             deprecation="${build.deprecation}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
-            executable="${javac9}"
+            encoding="ASCII"
+            executable="${build.main.javac}"
             fork="true">
        <include name="*.java"/>
-Line 658
+Line 688
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 683
+Line 711
             bootclasspath="${bootclasspath8}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac8}"
             fork="true">
        <include name="**/*.java"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 713
+Line 740
             bootclasspath="${bootclasspath8}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac8}"
             fork="true">
        <include name="**/*.java"/>
        <compilerarg value="-Xprefer:source"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all"/>
-       <compilerarg value="-Xdoclint:all/protected"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-Line 738
+Line 764
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
-Line 754
+Line 779
          <!-- JDK9+ test classes -->
          <exclude name="*9Test.java"/>
          <exclude name="*10Test.java"/>
+         <compilerarg value="-Werror"/>
        </javac-elements>
      </run-tck-tests>
    </target>
-Line 771
+Line 797
    <target name="4jdk8-test"
            depends="4jdk8-tck, 4jdk8-jtreg"
-           description="Runs tck and jtreg tests for jsr166-4jdk8">
+           description="Runs tck and jtreg tests for jsr166-4jdk8"/>
-   </target>
    <target name="4jdk8docs"
-Line 788
+Line 813
               access="${build.javadoc.access}"
               sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
               classpath=""
-              executable="${javadoc8}">
+              source="8"
+              executable="${javadoc8}"
+              failonerror = "true">
        <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
-Line 796
+Line 823
        <arg value="-XDignore.symbol.file=true"/>
        <arg value="-tag"/>
        <arg value="${javadoc.jls.option}"/>
-       <arg value="-tag"/>
+ <!-- @apiNote currently unused -->
-       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+ <!--       <arg value="-tag"/> -->
+ <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
        <arg value="-tag"/>
        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
        <arg value="-tag"/>
-Line 813
+Line 841
    <target name="4jdk8clean"
            description="Removes all 4jdk8 build products">
      <delete dir="${build.4jdk8.dir}"/>
    </target>
-Line 831
+Line 857
    </target>
+   <!-- jsr166 4jdk7 (no longer maintained) -->
-   <!-- jsr166 4jdk7 -->
+   <target name="4jdk7compile" depends="configure-compiler">
-   <target name="4jdk7compile"
-           depends="configure-compiler"
-           description="Compiles src/jdk7 sources, targeting jdk7">
      <mkdir dir="${build.4jdk7.classes.dir}"/>
      <javac srcdir="${4jdk7src.dir}"
-Line 851
+Line 873
             bootclasspath="${bootclasspath6}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac7}"
             fork="true">
-Line 860
+Line 883
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-   <target name="4jdk7doclint"
+   <target name="4jdk7doclint" depends="configure-compiler">
-           depends="configure-compiler"
-           description="Finds doclint warnings">
      <mkdir dir="${build.4jdk7.classes.dir}"/>
      <javac srcdir="${4jdk7src.dir}"
-Line 881
+Line 900
             bootclasspath="${bootclasspath6}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac8}"
             fork="true">
-Line 890
+Line 910
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Xdoclint:all/protected"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="4jdk7jar" depends="4jdk7compile">
-   <target name="4jdk7jar"
-           depends="4jdk7compile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${4jdk7product.jar}">
        <fileset dir="${build.4jdk7.classes.dir}"/>
        <manifest>
-Line 906
+Line 921
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="4jdk7-tck" depends="4jdk7jar">
-   <target name="4jdk7-tck"
-           depends="4jdk7jar"
-           description="Runs tck tests for jsr166-4jdk7 directly">
      <run-tck-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-Line 931
+Line 941
          <exclude name="SplittableRandomTest.java"/>
          <exclude name="StampedLockTest.java"/>
          <exclude name="SubmissionPublisherTest.java"/>
+         <compilerarg value="-Werror"/>
        </javac-elements>
      </run-tck-tests>
    </target>
    <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
-   <target name="4jdk7-tck-junit"
+   <target name="4jdk7-tck-junit" depends="4jdk7compile">
-           depends="4jdk7compile">
      <junit printsummary="true"
             showoutput="true"
-Line 960
+Line 969
        <test name="${jsr166.tckTestClass}" haltonfailure="no">
        </test>
      </junit>
    </target>
-   <target name="4jdk7-jtreg"
+   <target name="4jdk7-jtreg" depends="4jdk7jar">
-           depends="4jdk7jar"
-           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
      <run-jtreg-tests
         target="7"
         workdir="${build.4jdk7.dir}"
         classes="${4jdk7product.jar}"/>
    </target>
+   <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
-   <target name="4jdk7-test"
+   <target name="4jdk7docs">
-           depends="4jdk7-tck, 4jdk7-jtreg"
-           description="Runs tck and jtreg tests for jsr166-4jdk7">
-   </target>
-   <target name="4jdk7docs"
-           description="Builds javadocs for src/jdk7 to dist dir">
      <delete dir="${4jdk7docs.dir}"/>
      <mkdir dir="${4jdk7docs.dir}"/>
-Line 993
+Line 992
               access="${build.javadoc.access}"
               sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
               classpath=""
-              executable="${javadoc7}">
+              executable="${javadoc7}"
+              failonerror = "true">
        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
          <include name="**/*.java"/>
        </fileset>
 Line 1002
      </javadoc>
    </target>
+   <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
-   <target name="4jdk7dist"
+   <target name="4jdk7clean">
-           depends="4jdk7dist-jar, 4jdk7dist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="4jdk7clean"
-           description="Removes all 4jdk7 build products">
      <delete dir="${build.4jdk7.dir}"/>
    </target>
+   <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
-   <target name="4jdk7dist-jar"
-           depends="4jdk7clean, 4jdk7jar">
      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
    </target>
+   <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
-   <target name="4jdk7dist-docs"
-           depends="4jdk7clean, 4jdk7docs">
      <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
    </target>
-   <!-- jsr166x -->
+   <!-- jsr166x (no longer maintained) -->
-   <target name="jsr166xcompile"
-           depends="configure-compiler"
-           description="Compiles jsr166x sources to build dir">
+   <target name="jsr166xcompile" depends="configure-compiler">
      <mkdir dir="${build.jsr166x.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1047
+Line 1033
             target="5"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac7}"
             fork="true">
        <include name="jsr166x/**/*.java"/>
        <compilerarg value="-XDignore.symbol.file=true"/>
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="jsr166xjar" depends="jsr166xcompile">
-   <target name="jsr166xjar"
-           depends="jsr166xcompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166x.jar}">
        <fileset dir="${build.jsr166x.classes.dir}"/>
        <manifest>
-Line 1071
+Line 1052
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166xdocs">
-   <target name="jsr166xdocs"
-           description="Builds javadocs to dist dir">
      <delete dir="${jsr166xdocs.dir}"/>
      <mkdir dir="${jsr166xdocs.dir}"/>
-Line 1088
+Line 1065
               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
               bootclasspath="${bootclasspath6}"
               source="5"
-              executable="${javadoc7}">
+              executable="${javadoc7}"
+              failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
-   <target name="jsr166xdist"
+   <target name="jsr166xclean">
-           depends="jsr166xdist-jar, jsr166xdist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="jsr166xclean"
-           description="Removes all jsr166x build products">
      <delete dir="${build.jsr166x.dir}"/>
    </target>
+   <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
-   <target name="jsr166xdist-jar"
-           depends="jsr166xclean, jsr166xjar">
      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166xdist-docs"
+   <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
-           depends="jsr166xclean, jsr166xdocs">
      <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
    </target>
-   <!-- jsr166y -->
+   <!-- jsr166y (no longer maintained) -->
-   <target name="jsr166ycompile"
+   <target name="jsr166ycompile" depends="configure-compiler">
-           depends="configure-compiler"
-           description="Compiles jsr166y sources">
      <mkdir dir="${build.jsr166y.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1139
+Line 1103
             bootclasspath="${bootclasspath6}"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac7}"
             fork="true">
-Line 1147
+Line 1112
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="jsr166yjar" depends="jsr166ycompile">
-   <target name="jsr166yjar"
-           depends="jsr166ycompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166y.jar}" index="true">
        <fileset dir="${build.jsr166y.classes.dir}"/>
        <manifest>
-Line 1163
+Line 1123
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166ydocs">
-   <target name="jsr166ydocs"
-           description="Builds javadocs to dist dir">
      <delete dir="${jsr166ydocs.dir}"/>
      <mkdir dir="${jsr166ydocs.dir}"/>
-Line 1180
+Line 1136
               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
               bootclasspath="${bootclasspath6}"
               source="6"
-              executable="${javadoc7}">
+              executable="${javadoc7}"
+              failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
-   <target name="jsr166ydist"
+   <target name="jsr166yclean">
-           depends="jsr166ydist-jar, jsr166ydist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="jsr166yclean"
-           description="Removes all jsr166y build products">
      <delete dir="${build.jsr166y.dir}"/>
    </target>
+   <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
-   <target name="jsr166ydist-jar"
-           depends="jsr166yclean, jsr166yjar">
      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166ydist-docs"
+   <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
-           depends="jsr166yclean, jsr166ydocs">
      <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
    </target>
-   <!-- extra166y -->
+   <!-- extra166y (no longer maintained) -->
-   <target name="extra166ycompile"
-           depends="configure-compiler, jsr166yjar"
-           description="Compiles extra166y sources">
+   <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
      <mkdir dir="${build.extra166y.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1232
+Line 1174
             target="6"
             includeAntRuntime="false"
             includeJavaRuntime="false"
+            encoding="ASCII"
             executable="${javac7}"
             fork="true">
-Line 1240
+Line 1183
        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
+   <target name="extra166yjar" depends="extra166ycompile">
-   <target name="extra166yjar"
-           depends="extra166ycompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${extra166y.jar}" index="true">
        <fileset dir="${build.extra166y.classes.dir}"/>
        <manifest>
-Line 1256
+Line 1194
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="extra166ydocs">
-   <target name="extra166ydocs"
-           description="Builds javadocs to build dir">
      <delete dir="${extra166ydocs.dir}"/>
      <mkdir dir="${extra166ydocs.dir}"/>
-Line 1276
+Line 1210
               executable="${javadoc7}">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
-   <target name="extra166ydist"
+   <target name="extra166yclean">
-           depends="extra166ydist-jar, extra166ydist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="extra166yclean"
-           description="Removes all extra166y build products">
      <delete dir="${build.extra166y.dir}"/>
    </target>
+   <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
-   <target name="extra166ydist-jar"
-           depends="extra166yclean, extra166yjar">
      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="extra166ydist-docs"
+   <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
-           depends="extra166yclean, extra166ydocs">
      <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
    </target>
-   <!-- jsr166e -->
+   <!-- jsr166e (no longer maintained) -->
    <property name="build.jsr166e.java.version" value="6"/>
    <property name="build.jsr166e.javac" value="${javac6}"/>
-   <target name="jsr166ecompile"
+   <target name="jsr166ecompile" depends="configure-compiler">
-           depends="configure-compiler"
-           description="Compiles jsr166e sources">
      <mkdir dir="${build.jsr166e.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1333
+Line 1254
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg line="${build.args}"/>
      </javac>
    </target>
-   <!-- jsr166e: find doclint errors -->
    <target name="jsr166edoclint">
      <mkdir dir="${build.jsr166e.classes.dir}"/>
      <javac srcdir="${topsrc.dir}"
-Line 1361
+Line 1279
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-Werror"/>
        <compilerarg value="-Xdoclint:all/protected"/>
      </javac>
    </target>
+   <target name="jsr166ejar" depends="jsr166ecompile">
-   <target name="jsr166ejar"
-           depends="jsr166ecompile"
-           description="Builds library jar from compiled sources">
      <jar destfile="${jsr166e.jar}" index="true">
        <fileset dir="${build.jsr166e.classes.dir}"/>
        <manifest>
-Line 1377
+Line 1290
          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
        </manifest>
      </jar>
    </target>
+   <target name="jsr166edocs">
-   <target name="jsr166edocs"
-           description="Builds javadocs to build dir">
      <delete dir="${jsr166edocs.dir}"/>
      <mkdir dir="${jsr166edocs.dir}"/>
-Line 1393
+Line 1302
               access="${build.javadoc.access}"
               sourcepath="${topsrc.dir}:${jdk6.src.dir}"
               source="${build.jsr166e.java.version}"
-              executable="${javadoc7}">
+              executable="${javadoc7}"
+              failonerror = "true">
        <arg line="-Xdocrootparent ${java.docroot.url}"/>
        <arg value="-XDignore.symbol.file=true"/>
      </javadoc>
    </target>
+   <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
-   <target name="jsr166e-tck-one-java-version"
-           depends="jsr166ejar">
      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
      <run-tck-tests
        tck.src.dir="${test.src.dir}/tck-jsr166e"
        target="${build.jsr166e.java.version}"
-Line 1413
+Line 1318
        classes="${jsr166e.jar}"/>
    </target>
-   <target name="jsr166e-tck"
+   <target name="jsr166e-tck">
-           description="Runs tck tests for jsr166e for multiple java versions">
  <!--     <antcall target="clean"/> -->
  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
-Line 1435
+Line 1339
      </antcall>
    </target>
+   <target name="jsr166e-test" depends="jsr166e-tck"/>
-   <target name="jsr166e-test"
+   <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
-           depends="jsr166e-tck"
-           description="Runs all tests for jsr166e">
-   </target>
-   <target name="jsr166edist"
-           depends="jsr166edist-jar, jsr166edist-docs"
-           description="Puts all distributable products in single hierarchy"/>
-   <target name="jsr166eclean"
+   <target name="jsr166eclean">
-           description="Removes all jsr166e build products">
      <delete dir="${build.jsr166e.dir}"/>
    </target>
    <target name="jsr166edist-jar"
            depends="jsr166eclean, jsr166ejar">
      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
    </target>
-   <target name="jsr166edist-docs"
+   <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
-           depends="jsr166eclean, jsr166edocs">
      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
    </target>
-Line 1479
+Line 1373
    </target>
+ <!-- ==============================================================
+   Experimental errorprone support - http://errorprone.info
+   You may need to bring your own errorprone jar.
+ =================================================================== -->
+   <target name="errorprone"
+           depends="clean, configure-compiler"
+           description="Run errorprone over jsr166 source code (experimental)">
+     <local name="destdir"/>
+     <property name="destdir" value="${build.classes.dir}/java.base"/>
+     <mkdir dir="${destdir}"/>
+     <javac srcdir="${src.dir}"
+            destdir="${destdir}"
+            debug="${build.debug}"
+            debuglevel="${build.debuglevel}"
+            deprecation="${build.deprecation}"
+            classpath=""
+            includeAntRuntime="false"
+            includeJavaRuntime="false"
+            encoding="ASCII"
+            executable="${build.main.javac}"
+            fork="true">
+       <include name="**/*.java"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
+       <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
+       <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
+       <compilerarg value="-Xplugin:ErrorProne
+                           -Xep:IdentityBinaryExpression:WARN
+                           -Xep:MissingOverride:OFF
+                           -Xep:MixedArrayDimensions:WARN
+                           -Xep:RemoveUnusedImports:ERROR
+                           -Xep:ClassName:ERROR
+                           -Xep:MultipleTopLevelClasses:ERROR
+                           -Xep:EmptyIf:ERROR
+                           -Xep:LongLiteralLowerCaseSuffix:ERROR
+                           -Xep:ArgumentParameterSwap:ERROR
+                           -Xep:RedundantThrows:ERROR
+                           -Xep:MethodCanBeStatic:WARN"/>
+       <compilerarg value="--patch-module=java.base=${src.dir}"/>
+       <compilerarg value="-Xprefer:source"/>
+       <compilerarg value="-XDignore.symbol.file=true"/>
+       <compilerarg value="-Xlint:all"/>
+       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+       <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+       <compilerarg line="${build.args}"/>
+     </javac>
+     <jar destfile="${product.jar}">
+       <fileset dir="${destdir}"/>
+     </jar>
+     <run-tck-tests
+       target="${build.main.java.version}"
+       workdir="${build.dir}"
+       classes="${product.jar}">
+       <javac-elements>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
+         <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
+         <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
+         <compilerarg value="-Xplugin:ErrorProne
+                             -Xep:IdentityBinaryExpression:WARN
+                             -Xep:BoxedPrimitiveConstructor:OFF
+                             -Xep:HashtableContains:OFF
+                             -Xep:ModifyingCollectionWithItself:OFF
+                             -Xep:MissingOverride:OFF
+                             -Xep:MixedArrayDimensions:WARN
+                             -Xep:RemoveUnusedImports:ERROR
+                             -Xep:ClassName:ERROR
+                             -Xep:MultipleTopLevelClasses:ERROR
+                             -Xep:EmptyIf:ERROR
+                             -Xep:LongLiteralLowerCaseSuffix:ERROR
+                             -Xep:ArgumentParameterSwap:ERROR
+                             -Xep:RedundantThrows:ERROR
+                             -Xep:MethodCanBeStatic:WARN"/>
+         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+       </javac-elements>
+     </run-tck-tests>
+   </target>
+ <!-- ==============================================================
+   Running guava tests against jsr166 code
+ =================================================================== -->
+ <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
+ <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
+ <!-- <property name="guava.version" value="21.0"/> -->
+ <!-- HOWTO debug print a path id -->
+ <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
+ <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
+ <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
+ <!--   organisation="com.google.guava" module="guava-tests"/> -->
+ <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
+ <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
+ <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
+ <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
+ <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
+ <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
+ <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
+ <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
+ <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
+ <!--   type="*" inline="true" conf="*(private),*(public)" -->
+ <!--   pattern="${guava.dir}/[artifact].[ext]" -->
+ <!--   organisation="com.google.guava" module="guava-testlib"/> -->
+ <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
+ <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
+ <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
+   <target name="init-ivy">
+     <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
+          dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
+     <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
+              classpath="${build.dir}/ivy.jar"/>
+   </target>
+   <target name="guava-tests" depends="jar, init-ivy"
+           description="Guava tests run against jsr166 collections">
+     <property name="guava.dir" value="${build.dir}/guava-testlib"/>
+     <mkdir dir="${guava.dir}"/>
+     <ivy:retrieve pathid="guava.testlib.classpath"
+       type="jar,bundle" inline="true" conf="default,master"
+       pattern="${guava.dir}/[artifact].[ext]"
+       organisation="com.google.guava" module="guava-testlib"/>
+     <property name="guava.version" value="21.0"/>
+     <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
+          dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
+     <junit printsummary="true" showoutput="true" haltonfailure="true"
+            jvm="${build.main.java}" fork="true">
+       <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
+       <formatter type="brief"/>
+       <classpath>
+         <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
+         <path refid="guava.testlib.classpath"/>
+       </classpath>
+       <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
+       <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
+     </junit>
+   </target>
  </project>

 Legend:



Removed from v.1.205
 


changed lines


 
Added in v.1.247
 Legend:



Removed from v.1.205
 


changed lines


 
Added in v.1.247
-Removed from v.1.205
+Added in v.1.247

dl@cs.oswego.edu	ViewVC Help
Powered by ViewVC 1.1.27