ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC vs.
Revision 1.305 by jsr166, Sun Oct 6 17:51:03 2019 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26    where each of the above is a JDK or a symlink to same, and
27 <  $HOME/jdk/src/jdk6
28 <  $HOME/jdk/src/jdk7
29 <  $HOME/jdk/src/jdk8
30 <  where each of the above is a complete JDK source tree
31 <  (e.g. mercurial forest) or a symlink to same.
27 >  $HOME/jdk/src/jdk11
28 >  $HOME/jdk/src/jdk12
29 >  $HOME/jdk/src/jdk13
30 >  $HOME/jdk/src/jdk14
31 >  where each of the above is a JDK source tree or a symlink to same.
32 >
33 >  Alternatively, define ant variables thus:
34 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
35 >  for $N in 11 .. 14 ...
36 >
37 >  As of 2016-03, the sources in src/main are for jdk9+ only.
38 >  As of 2019-08, the sources in src/main are for jdk11+ only.
39 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
43 <  <target name="usage" description="Advises user to run with -projecthelp">
44 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
43 >  <!-- Run 'ant -projecthelp' (default target) -->
44 >  <target name="usage">
45 >    <java classname="org.apache.tools.ant.Main">
46 >      <arg value="-projecthelp" />
47 >    </java>
48    </target>
49  
50 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
51  
52    <!-- User-specific settings -->
53    <property file="user.properties"/>
54  
55  
56    <!-- Compilation options -->
38  <property name="build.sourcelevel"    value="6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
60 +  <property name="build.javadoc.access" value="protected"/>
61  
62    <!-- Build locations -->
63    <property name="build.dir"                   location="build"/>
64    <property name="build.classes.dir"           location="${build.dir}/classes"/>
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48  <property name="build.reports.dir"           location="${build.dir}/reports"/>
67  
68 <  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 <  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 <  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53 <  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54 <
55 <  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56 <  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57 <  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58 <  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59 <
60 <  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61 <  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62 <  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63 <  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 <
65 <  <!-- JDK binary locations -->
68 >  <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
70  
71    <macrodef name="defjdklocations">
72      <attribute name="v"/>
73      <sequential>
74 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
75 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
76 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
77 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
78 <    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
79 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80 <    <property name="bootclasspath@{v}"
81 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
76 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80 >    </sequential>
81 >  </macrodef>
82 >
83 >  <macrodef name="mirror-dir">
84 >    <attribute name="src"/>
85 >    <attribute name="dst"/>
86 >    <sequential>
87 >    <delete dir="@{dst}"/>
88 >    <mkdir dir="@{dst}"/>
89 >    <copy todir="@{dst}" preservelastmodified="true">
90 >      <fileset dir="@{src}"/>
91 >    </copy>
92      </sequential>
93    </macrodef>
94  
95 <  <defjdklocations v="6"/>
96 <  <defjdklocations v="7"/>
97 <  <defjdklocations v="8"/>
95 >  <defjdklocations v="11"/>
96 >  <defjdklocations v="12"/>
97 >  <defjdklocations v="13"/>
98 >  <defjdklocations v="14"/>
99 >
100 >  <!-- Source locations -->
101 >  <property name="src.dir"              location="${basedir}/src/main"/>
102 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
103 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
105 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110 >  <property name="lib.dir"              location="${basedir}/lib"/>
111 >  <property name="dist.dir"             location="${basedir}/dist"/>
112 >  <property name="topsrc.dir"           location="${basedir}/src"/>
113 >
114 >  <!-- Javadoc locations -->
115 >  <property name="docs.dir"          location="${build.dir}/docs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117 >
118 >  <!-- Jar locations -->
119 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
120 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121 >
122 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138 >
139 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145 >
146 >  <!-- Define the "jtreg" task -->
147 >  <!-- See the docs in "jtreg -onlineHelp" -->
148 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149 >           classpath="${lib.dir}/jtreg.jar" />
150  
151 +  <!-- Tck configuration options; see JSR166TestCase.java
152 +   To profile a single tck test class:
153 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154 +   To stress test a single tck test class:
155 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
156 +   To stress test a single tck test method:
157 +   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
158 +  -->
159 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
160    <macrodef name="run-tck-tests">
161 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
162      <attribute name="target"/>
163 +    <attribute name="compile-target" default="@{target}"/>
164      <attribute name="workdir"/>
165 <    <attribute name="product.jar" default="${product.jar}"/>
166 <    <attribute name="jvmflags" default=""/>
165 >    <attribute name="classes"/>
166 >    <!--
167 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
168 >    -->
169 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
170 >    <element name="javac-elements" optional="true"/>
171 >
172      <sequential>
173  
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176 <    <javac srcdir="${tck.src.dir}"
176 >    <javac srcdir="@{tck.src.dir}"
177             destdir="@{workdir}/tck-classes"
178             debug="${build.debug}"
179             debuglevel="${build.debuglevel}"
180             deprecation="${build.deprecation}"
181 <           source="6"
181 >           source="@{compile-target}"
182 >           target="@{compile-target}"
183             classpath="${junit.jar}"
102           bootclasspath="@{product.jar}:${bootclasspath6}"
184             includeAntRuntime="false"
185             includeJavaRuntime="false"
186 <           executable="${javac@{target}}"
186 >           encoding="ASCII"
187 >           executable="${javac@{compile-target}}"
188             fork="true">
189  
190 <      <include name="**/*.java"/>
190 >      <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>
192 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
193 <      <compilerarg line="${build.args}"/>
192 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195 >      <compilerarg line="${build.args}"/>
196 >      <javac-elements/>
197 >
198      </javac>
199  
200 <    <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
201 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
202 <        <jvmarg line="@{jvmflags}"/>
203 <        <classpath>
204 <          <pathelement location="${junit.jar}"/>
205 <          <pathelement location="@{workdir}/tck-classes"/>
206 <        </classpath>
200 >    <java classname="${jsr166.tckTestClass}"
201 >          failonerror="true"
202 >          jvm="${java@{target}}"
203 >          fork="true">
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213 >
214 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225      </java>
226  
227      </sequential>
228    </macrodef>
229  
230 <  <!-- Source locations -->
231 <  <property name="src.dir"              location="${basedir}/src/main"/>
232 <  <property name="test.src.dir"         location="${basedir}/src/test"/>
233 <  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
234 <  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
235 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
236 <  <property name="lib.dir"              location="${basedir}/lib"/>
237 <  <property name="dist.dir"             location="${basedir}/dist"/>
238 <  <property name="topsrc.dir"           location="${basedir}/src"/>
239 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
240 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
241 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
242 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
243 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
140 <
141 <  <!-- Distribution locations -->
142 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
230 >  <!-- Define jtreg test sets for different jdk versions -->
231 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233 >  <property name="jtreg.test.pattern" value="**/*.java"/>
234 >  <macrodef name="defjtregtests">
235 >    <attribute name="v"/>
236 >    <sequential>
237 >      <fileset dir="${jtreg@{v}.src.dir}">
238 >        <patternset id="jdk@{v}.jtreg.tests">
239 >          <include name="${jtreg.test.pattern}"/>
240 >        </patternset>
241 >      </fileset>
242 >    </sequential>
243 >  </macrodef>
244  
245 <  <!-- Jar locations -->
246 <  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
247 <  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
248 <  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153 <  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154 <  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155 <  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156 <  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249  
250 <  <!-- Bootclasspath argument -->
251 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
250 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251 >  <property name="jtreg.flags" value=""/>
252  
253 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
254 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
255 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
256 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
257 <
258 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
259 <  <!-- The below does not yet exist as of 2012-11 -->
260 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
253 >  <macrodef name="run-jtreg-tests">
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255 >    <attribute name="target"/>
256 >    <attribute name="workdir"/>
257 >    <attribute name="classes"/>
258 >    <attribute name="verbose" default="${jtreg.verbose}"/>
259 >    <attribute name="jtregflags" default=""/>
260 >    <element name="jtreg-elements" optional="true"/>
261  
262 <  <!-- Default jdk api doc location (latest stable release seems best) -->
171 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
262 >    <sequential>
263  
264 <  <!-- Define the "jtreg" task -->
265 <  <!-- See the docs in "jtreg -onlineHelp" -->
175 <  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176 <           classpath="${lib.dir}/jtreg.jar" />
264 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
266  
267 <  <!-- Test classpath -->
268 <  <path id="test.classpath">
269 <    <pathelement location="${build.testcases.dir}"/>
270 <    <pathelement location="${junit.jar}"/>
271 <  </path>
267 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
268 >    <jtreg dir="${jtreg@{target}.src.dir}"
269 >           jdk="${jdk@{target}.home}"
270 >           workDir="@{workdir}/JTwork">
271 >      <patternset refid="jdk@{target}.jtreg.tests"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274 >      <arg value="-agentvm"/>
275 >      <arg value="-noreport"/>
276 >      <arg value="-verbose:@{verbose}"/>
277 >      <arg value="-vmoptions:-esa -ea"/>
278 >      <arg value="-automatic"/>
279 >      <arg value="-k:!ignore"/>
280 >      <arg line="@{jtregflags}"/>
281 >      <arg line="${jtreg.flags}"/>
282 >      <jtreg-elements/>
283 >    </jtreg>
284 >    </sequential>
285 >  </macrodef>
286  
287    <!-- ALoops classpath -->
288    <path id="loops.classpath">
# Line 187 | Line 290
290    </path>
291  
292    <!-- Support @jls tag, used in jdk8+ javadoc -->
293 <  <!-- TODO: How do we get &trade to work? -->
294 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
192 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
193 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
293 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 +  <!-- Default values: may seem strange ... -->
300 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 +  <!-- But at build time, target jdk9, for maximal binary portability -->
302 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 +    o override-methods=summary
305 +    o {@systemProperty ...}
306 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 +    o 8202628: javadoc generates bad links in TestModules.java
308 +    -->
309 +  <property name="java.runtime.target" value="11"/>
310 +  <property name="build.main.java" value="${java11}"/>
311 +  <property name="build.main.javac" value="${javac11}"/>
312 +  <property name="build.main.javadoc" value="${javadoc12}"/>
313 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314 +
315    <target name="dists"
316 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
316 >          depends="dist"
317            description="Builds all public jars and docs"/>
318  
319    <target name="compile"
320            depends="configure-compiler"
321            description="Compiles src/main sources to build dir">
322  
323 <    <mkdir dir="${build.classes.dir}"/>
323 >    <local name="destdir"/>
324 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
325 >
326 >    <mkdir dir="${destdir}"/>
327  
328      <javac srcdir="${src.dir}"
329 <           destdir="${build.classes.dir}"
329 >           destdir="${destdir}"
330             debug="${build.debug}"
331             debuglevel="${build.debuglevel}"
332             deprecation="${build.deprecation}"
333             classpath=""
334             includeAntRuntime="false"
335             includeJavaRuntime="false"
336 <           executable="${javac8}"
336 >           encoding="ASCII"
337 >           executable="${build.main.javac}"
338             fork="true">
339  
340        <include name="**/*.java"/>
341 <      <compilerarg line="${build.args}"/>
341 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
342 >      <compilerarg value="-Xprefer:source"/>
343        <compilerarg value="-XDignore.symbol.file=true"/>
344 <      <compilerarg value="-Xlint:all"/>
345 <
346 < <!--
347 <      <exclude name="java/lang/**"/>
344 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345 >      <compilerarg value="-Xlint:all,-removal"/>
346 >      <compilerarg line="--doclint-format html5"/>
347 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
349 >      <compilerarg value="-Werror"/>
350 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
227      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
228 -->
352  
353      </javac>
231
354    </target>
355  
356  
235
357    <target name="jar"
358            depends="compile"
359 <          description="Builds library jar from compiled sources">
360 <
359 >          description="Builds library jar for src/main from compiled sources">
360 >    <local name="subdir"/>
361 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
362      <jar destfile="${product.jar}">
363 <      <fileset dir="${build.classes.dir}"/>
363 >      <fileset dir="${build.classes.dir}${subdir}"/>
364 >      <manifest>
365 >        <attribute name="Built-By" value="${user.name}"/>
366 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
367 >      </manifest>
368      </jar>
243
369    </target>
370  
371  
247
248  <target name="test"
249          depends="configure-tests, report-tests"
250          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
251
252
253
372    <target name="docs"
373            description="Builds javadocs for src/main to dist dir">
374  
375 <    <delete dir="${dist.javadocs.dir}"/>
376 <    <mkdir dir="${dist.javadocs.dir}"/>
375 >    <delete dir="${docs.dir}"/>
376 >    <mkdir dir="${docs.dir}"/>
377 >
378 >    <!-- old school frames via docs/index.html?overview-summary.html -->
379 >    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 >    <local name="use-frames"/>
381 >    <condition property="use-frames">
382 >      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 >    </condition>
384  
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
388 <    <javadoc destdir="${dist.javadocs.dir}"
388 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
389 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
390 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
391 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
392 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
393 >    <javadoc destdir="${docs.dir}"
394               packagenames="none"
395 <             link="${jdkapi8docs.url}"
395 >             link="${java.api.url}"
396               overview="${src.dir}/intro.html"
397 <             sourcepath="${src.dir}:${jdk8src.dir}"
397 >             access="${build.javadoc.access}"
398 >             sourcepath="${src.dir}"
399               classpath=""
400 <             executable="${javadoc8}">
401 <      <arg value="-XDignore.symbol.file=true"/>
402 <      <arg value="-tag"/>
272 <      <arg value="${javadoc.jls.option}"/>
400 >             source="${build.main.javadoc.source}"
401 >             executable="${build.main.javadoc}">
402 > <!-- TODO: JDK-8214571 failonerror = "true" -->
403        <fileset dir="${src.dir}" defaultexcludes="yes">
404          <include name="**/*.java"/>
405        </fileset>
406 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 +      <arg value="-XDignore.symbol.file=true"/>
409 +      <arg value="-html5"/>
410 +      <arg value="--patch-module=java.base=${src.dir}"/>
411 +      <arg value="--frames" if:set="use-frames"/>
412 +      <arg value="--override-methods=summary"/>
413 +      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
414 +      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
415 +      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
416 +      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
417 + <!-- tags added in jdk9: currently unused -->
418 + <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
419 + <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
420      </javadoc>
277
421    </target>
422  
423  
281
424    <target name="dist"
425 <          depends="dist-clean, dist-jar, docs"
425 >          depends="dist-clean, dist-jar, dist-docs"
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
287  <target name="release"
288          depends="dist"
289          description="Puts entire CVS tree, plus distribution productions, in a jar">
290
291    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
292
293    <jar basedir="${basedir}" destfile="${release.jar}">
294      <!-- <exclude name="build/**"/> -->
295      <exclude name="${release.jar}"/>
296      <exclude name="user.properties"/>
297      <exclude name="etc/notes/**"/>
298      <exclude name="src/emulation/**"/>
299      <exclude name="**/SyntaxTest.java"/>
300      <exclude name="**/SuperfluousAbstract.java"/>
301    </jar>
302
303  </target>
304
305
306
429    <target name="clean"
430            description="Removes all build products">
309
431      <delete dir="${build.dir}"/>
311
432    </target>
433  
434  
315
435    <target name="dist-clean"
436            description="Removes all build and distribution products">
437 <
437 >    <delete dir="${build.dir}"/>
438      <delete dir="${dist.dir}"/>
320
439    </target>
440  
441  
324
325  <!-- Internal targets -->
326
327
442    <target name="dist-jar"
443            depends="clean, jar">
330
444      <copy file="${product.jar}" todir="${dist.dir}"/>
332
445    </target>
446  
447 <
448 <  <target name="compile-tests"
449 <          depends="jar">
338 <
339 <    <mkdir dir="${build.testcases.dir}"/>
340 <
341 <    <javac srcdir="${tck.src.dir}"
342 <           destdir="${build.testcases.dir}"
343 <           debug="${build.debug}"
344 <           debuglevel="${build.debuglevel}"
345 <           deprecation="${build.deprecation}"
346 <           source="6"
347 <           classpath="${junit.jar}"
348 <           bootclasspath="${product.jar}:${bootclasspath6}"
349 <           includeAntRuntime="false"
350 <           includeJavaRuntime="false"
351 <           executable="${javac8}"
352 <           fork="true">
353 <
354 <      <include name="**/*.java"/>
355 <      <compilerarg line="${build.args}"/>
356 <      <compilerarg value="-XDignore.symbol.file=true"/>
357 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
358 <
359 <    </javac>
360 <
361 <    <javac srcdir="${test.src.dir}"
362 <           destdir="${build.testcases.dir}"
363 <           debug="${build.debug}"
364 <           debuglevel="${build.debuglevel}"
365 <           deprecation="${build.deprecation}"
366 <           source="6"
367 <           classpath=""
368 <           bootclasspath="${product.jar}:${bootclasspath6}"
369 <           includeAntRuntime="false"
370 <           includeJavaRuntime="false"
371 <           executable="${javac8}"
372 <           fork="true">
373 <
374 <      <include name="jsr166/test/**/*.java"/>
375 <
376 <      <compilerarg line="${build.args}"/>
377 <      <compilerarg value="-XDignore.symbol.file=true"/>
378 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
379 <
380 <    </javac>
381 <
382 < <!--
383 <    <javac srcdir="${jtreg.src.dir}"
384 <          destdir="${build.testcases.dir}"
385 <            debug="${build.debug}"
386 <       debuglevel="${build.debuglevel}"
387 <      deprecation="${build.deprecation}"
388 <           source="${build.sourcelevel}"
389 <             fork="true">
390 <
391 <      <compilerarg value="${bootclasspath.args}"/>
392 <      <compilerarg line="${build.args}"/>
393 <      <compilerarg value="-XDignore.symbol.file=true"/>
394 <
395 <    </javac>
396 < -->
397 <
447 >  <target name="dist-docs"
448 >          depends="clean, docs">
449 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 +  <target name="tck"
453 +          depends="jar"
454 +          description="Runs tck tests for src/main directly">
455  
456 <  <target name="run-tests"
457 <          depends="compile-tests">
458 <
459 <    <!-- May be overridden by user.properties -->
460 <    <property name="testcase" value="*"/>
461 <
462 <    <mkdir dir="${build.reports.dir}"/>
463 <
464 <    <junit printsummary="true"
465 <             showoutput="true"
466 <          errorProperty="junit.failed"
467 <        failureProperty="junit.failed"
468 <                    dir="${build.reports.dir}"
469 <                    jvm="${java8}"
470 <                   fork="true">
471 <
472 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
473 <      <jvmarg value="-server"/>
474 <      <jvmarg value="-showversion"/>
475 <
476 <      <classpath refid="test.classpath"/>
477 <
478 <      <formatter type="xml"/>
479 <
480 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
481 <        <fileset dir="${tck.src.dir}">
482 <          <include name="**/${testcase}Test.java"/>
483 <        </fileset>
484 <      </batchtest>
485 <
486 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
487 <        <fileset dir="${test.src.dir}">
488 <          <include name="jsr166/test/**/${testcase}Test.java"/>
489 <        </fileset>
490 <      </batchtest>
491 <
492 < <!--
493 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
439 <        <fileset dir="${jtreg.src.dir}">
440 <          <include name="**/${testcase}Test.java"/>
441 <        </fileset>
442 <      </batchtest>
443 < -->
444 <
445 <    </junit>
446 <
456 >    <run-tck-tests
457 >      target="${java.runtime.target}"
458 >      workdir="${build.dir}"
459 >      classes="${product.jar}">
460 >      <javac-elements>
461 >        <compilerarg value="-Werror"/>
462 >      </javac-elements>
463 >    </run-tck-tests>
464 >  </target>
465 >
466 >  <target name="tck-parallelism-1"
467 >          description="Runs tck with common pool parallelism 1">
468 >    <antcall target="tck">
469 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470 >    </antcall>
471 >  </target>
472 >
473 >  <target name="tck-parallelism-0"
474 >          description="Runs tck with common pool parallelism 0">
475 >    <antcall target="tck">
476 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477 >    </antcall>
478 >  </target>
479 >
480 >  <target name="tck-security-manager"
481 >          description="Runs tck with a security manager">
482 >    <antcall target="tck">
483 >      <param name="jsr166.useSecurityManager" value="true"/>
484 >    </antcall>
485 >  </target>
486 >
487 >  <target name="jtreg"
488 >          depends="jar"
489 >          description="Runs jtreg tests for src/main using the jtreg ant task">
490 >    <run-jtreg-tests
491 >       target="${java.runtime.target}"
492 >       workdir="${build.dir}"
493 >       classes="${product.jar}"/>
494    </target>
495  
496 +  <target name="test"
497 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
498 +          description="Runs tck and jtreg tests for src/main"/>
499  
500 <  <target name="report-tests"
501 <          depends="run-tests">
502 <
453 <    <!-- Sets junit.report.format to frames if redirection is present,
454 <         otherwise sets it to noframes. -->
455 <    <available property="junit.report.format"
456 <                  value="frames"
457 <              classname="org.apache.xalan.lib.Redirect"
458 <    />
459 <    <property name="junit.report.format" value="noframes"/>
460 <
461 <    <junitreport todir="${build.reports.dir}">
462 <      <fileset dir="${build.reports.dir}">
463 <        <include name="TEST-*.xml"/>
464 <      </fileset>
465 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
466 <      />
467 <    </junitreport>
468 <
469 <    <fail message="Test Cases Failed" if="junit.failed"/>
500 >  <target name="test-version-permutations"
501 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
502 >  </target>
503  
504 +  <target name="test11">
505 +    <antcall target="clean"/>
506 +    <antcall>
507 +      <param name="java.runtime.target" value="11"/>
508 +      <param name="build.main.javac" value="${javac11}"/>
509 +      <param name="build.main.javadoc" value="${javadoc12}"/>
510 +      <param name="build.main.javadoc.source" value="11"/>
511 +      <target name="test"/>
512 +      <target name="docs"/>
513 +    </antcall>
514 +  </target>
515 +
516 +  <target name="test12">
517 +    <antcall target="clean"/>
518 +    <antcall>
519 +      <param name="java.runtime.target" value="12"/>
520 +      <param name="build.main.javac" value="${javac12}"/>
521 +      <param name="build.main.javadoc" value="${javadoc12}"/>
522 +      <param name="build.main.javadoc.source" value="12"/>
523 +      <target name="test"/>
524 +      <target name="docs"/>
525 +    </antcall>
526 +  </target>
527 +
528 +  <target name="test13">
529 +    <antcall target="clean"/>
530 +    <antcall>
531 +      <param name="java.runtime.target" value="13"/>
532 +      <param name="build.main.javac" value="${javac13}"/>
533 +      <param name="build.main.javadoc" value="${javadoc13}"/>
534 +      <param name="build.main.javadoc.source" value="13"/>
535 +      <target name="test"/>
536 +      <target name="docs"/>
537 +    </antcall>
538 +  </target>
539 +
540 +  <target name="test14">
541 +    <antcall target="clean"/>
542 +    <antcall>
543 +      <param name="java.runtime.target" value="14"/>
544 +      <param name="build.main.javac" value="${javac14}"/>
545 +      <param name="build.main.javadoc" value="${javadoc14}"/>
546 +      <param name="build.main.javadoc.source" value="14"/>
547 +      <target name="test"/>
548 +      <target name="docs"/>
549 +    </antcall>
550 +  </target>
551 +
552 +  <target name="test11-12">
553 +    <antcall target="clean"/>
554 +    <antcall>
555 +      <param name="java.runtime.target" value="12"/>
556 +      <param name="build.main.javac" value="${javac11}"/>
557 +      <param name="build.main.javadoc" value="${javadoc12}"/>
558 +      <param name="build.main.javadoc.source" value="11"/>
559 +      <target name="test"/>
560 +      <target name="docs"/>
561 +    </antcall>
562 +  </target>
563 +
564 +  <target name="test11-13">
565 +    <antcall target="clean"/>
566 +    <antcall>
567 +      <param name="java.runtime.target" value="13"/>
568 +      <param name="build.main.javac" value="${javac11}"/>
569 +      <param name="build.main.javadoc" value="${javadoc13}"/>
570 +      <param name="build.main.javadoc.source" value="11"/>
571 +      <target name="test"/>
572 +      <target name="docs"/>
573 +    </antcall>
574 +  </target>
575 +
576 +  <target name="test11-14">
577 +    <antcall target="clean"/>
578 +    <antcall>
579 +      <param name="java.runtime.target" value="14"/>
580 +      <param name="build.main.javac" value="${javac11}"/>
581 +      <param name="build.main.javadoc" value="${javadoc14}"/>
582 +      <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="test"/>
584 +      <target name="docs"/>
585 +    </antcall>
586    </target>
587  
588  
589    <target name="configure-compiler">
590 +    <fail message="ant version too old">
591 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
592 +    </fail>
593  
594      <property name="unchecked.option" value="-Xlint:unchecked"/>
595  
# Line 488 | Line 606
606    </target>
607  
608  
609 <  <target name="configure-tests"
610 <       depends="configure-compiler">
609 >  <target name="compile-test-loops" depends="jar"
610 >          description="Compiles all the perf tests in src/test/loops">
611  
612 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
495 <    <available property="junit.available"
496 <               classname="junit.framework.Protectable"/>
612 >    <mkdir dir="${build.dir}/test/loops"/>
613  
614 <    <!-- Xalan -->
615 <    <available property="xalan.available"
500 <               classname="org.apache.xalan.Version"/>
501 <
502 <
503 <    <!-- Ant 1.6beta and later don't need or want this check -->
504 <    <!--
505 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
506 <          unless="junit.available"/>
507 <
508 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
509 <          unless="xalan.available"/>
510 <    -->
511 <
512 <  </target>
513 <
514 <
515 <  <!-- Various demos and test programs -->
516 <
517 <
518 <  <target name="loops" depends="configure-compiler"
519 <          description="Benchmark from Doug Lea's AQS paper">
520 <
521 <    <mkdir dir="${build.loops.dir}"/>
522 <
523 <    <javac srcdir="${loops.src.dir}"
524 <          destdir="${build.loops.dir}"
525 <            debug="${build.debug}"
526 <       debuglevel="${build.debuglevel}"
527 <      deprecation="${build.deprecation}"
528 <           source="${build.sourcelevel}"
529 <             fork="true">
530 <
531 <      <compilerarg line="${build.args}"/>
532 <      <classpath refid="loops.classpath"/>
533 <      <compilerarg value="-XDignore.symbol.file=true"/>
534 <
535 <    </javac>
536 <
537 <    <java classname="ALoops" fork="true">
538 <      <classpath refid="loops.classpath"/>
539 <    </java>
540 <
541 <  </target>
542 <
543 <
544 <  <!-- jsr166 4jdk7 -->
545 <
546 <
547 <  <target name="4jdk7compile"
548 <          depends="configure-compiler"
549 <          description="Compiles src/jdk7 sources, targeting jdk7">
550 <
551 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
552 <
553 <    <javac srcdir="${4jdk7src.dir}"
554 <           destdir="${build.4jdk7.classes.dir}"
614 >    <javac srcdir="${basedir}/src/test/loops"
615 >           destdir="${build.dir}/test/loops"
616             debug="${build.debug}"
617             debuglevel="${build.debuglevel}"
618             deprecation="${build.deprecation}"
558           source="6"
559           classpath=""
560           bootclasspath="${bootclasspath6}"
619             includeAntRuntime="false"
620             includeJavaRuntime="false"
621 <           executable="${javac7}"
621 >           encoding="ASCII"
622 >           executable="${build.main.javac}"
623             fork="true">
624  
625 <      <include name="**/*.java"/>
567 <      <compilerarg line="${build.args}"/>
625 >      <include name="*.java"/>
626        <compilerarg value="-XDignore.symbol.file=true"/>
627 <      <compilerarg value="-Xlint:all"/>
628 <
571 <    </javac>
572 <
573 <  </target>
574 <
575 <  <target name="4jdk7-jar"
576 <          depends="4jdk7compile"
577 <          description="Builds library jar from compiled sources">
578 <
579 <    <jar destfile="${4jdk7product.jar}">
580 <      <fileset dir="${build.4jdk7.classes.dir}"/>
581 <    </jar>
582 <
583 <  </target>
584 <
585 <
586 <  <target name="4jdk7-test-tck"
587 <          depends="4jdk7-jar"
588 <          description="Runs tck tests for jsr166-4jdk7 directly">
589 <
590 <    <run-tck-tests
591 <      target="7"
592 <      workdir="${build.4jdk7.dir}"
593 <      product.jar="${4jdk7product.jar}"/>
594 <  </target>
595 <
596 <
597 <  <target name="4jdk7-test-tck-junit"
598 <          depends="4jdk7compile"
599 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
600 <
601 <    <junit printsummary="true"
602 <           showoutput="true"
603 <           errorProperty="junit.failed"
604 <           failureProperty="junit.failed"
605 <           includeantruntime="true"
606 <           jvm="${java7}"
607 <           fork="true">
608 <
609 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
610 <      <jvmarg value="-server"/>
611 <
612 <      <classpath>
613 <        <pathelement location="${junit.jar}"/>
614 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
615 <      </classpath>
616 <
617 <      <formatter type="brief"/>
618 <
619 <      <test name="JSR166TestCase" haltonfailure="no">
620 <      </test>
621 <
622 <    </junit>
623 <  </target>
624 <
625 <  <target name="4jdk7-test-jtreg"
626 <          depends="4jdk7compile"
627 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632 <    <jtreg dir="${jtreg.src.dir}"
633 <           jdk="${jdk7.home}"
634 <           workDir="${build.4jdk7.dir}/JTwork"
635 <           reportDir="${build.4jdk7.dir}/JTreport">
636 <
637 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638 <      <arg value="-agentvm"/>
639 <      <arg value="-v:nopass,fail"/>
640 <      <arg value="-vmoptions:-esa -ea"/>
641 <      <arg value="-automatic"/>
642 <      <arg value="-k:!ignore"/>
643 <    </jtreg>
644 <  </target>
645 <
646 <
647 <  <target name="4jdk7-test"
648 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
650 <  </target>
651 <
652 <
653 <  <target name="4jdk7docs"
654 <          description="Builds javadocs for src/jdk7 to dist dir">
655 <
656 <    <delete dir="${dist.4jdk7.docs.dir}"/>
657 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
658 <
659 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
660 <             packagenames="none"
661 <             link="${jdkapi7docs.url}"
662 <             overview="${4jdk7src.dir}/intro.html"
663 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
664 <             classpath=""
665 <             executable="${javadoc7}">
666 <      <arg value="-XDignore.symbol.file=true"/>
667 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
668 <        <include name="**/*.java"/>
669 <      </fileset>
670 <    </javadoc>
671 <
672 <  </target>
673 <
674 <
675 <  <target name="4jdk7dist"
676 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
677 <          description="Puts all distributable products in single hierarchy"/>
678 <
679 <
680 <
681 <  <target name="4jdk7clean"
682 <          description="Removes all 4jdk7 build products">
683 <
684 <    <delete dir="${build.4jdk7.dir}"/>
685 <
686 <  </target>
687 <
688 <
689 <
690 <  <target name="4jdk7dist-clean"
691 <          description="Removes all build and distribution products">
692 <
693 <  </target>
694 <
695 <  <target name="4jdk7dist-jar"
696 <          depends="4jdk7clean, 4jdk7compile">
697 <
698 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
699 <
700 <  </target>
701 <
702 <
703 <  <!-- jsr166x -->
704 <
705 <  <target name="jsr166xcompile"
706 <          depends="configure-compiler"
707 <          description="Compiles jsr166x sources to build dir">
708 <
709 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
710 <
711 <    <javac srcdir="${topsrc.dir}"
712 <           destdir="${build.jsr166x.classes.dir}"
713 <           debug="${build.debug}"
714 <           debuglevel="${build.debuglevel}"
715 <           deprecation="${build.deprecation}"
716 <           classpath=""
717 <           source="5"
718 <           bootclasspath="${bootclasspath6}"
719 <           includeAntRuntime="false"
720 <           includeJavaRuntime="false"
721 <           executable="${javac7}"
722 <           fork="true">
723 <
724 <      <include name="jsr166x/**/*.java"/>
627 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
628 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
629        <compilerarg line="${build.args}"/>
726      <compilerarg value="-XDignore.symbol.file=true"/>
727      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
728
630      </javac>
730
631    </target>
632  
633  
634 +  <!-- old branches no longer maintained.  build support deleted -->
635 +  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
636 +  <!-- jsr166 4jdk7 (no longer maintained) -->
637 +  <!-- jsr166x (no longer maintained) -->
638 +  <!-- jsr166y (no longer maintained) -->
639 +  <!-- extra166y (no longer maintained) -->
640 +  <!-- jsr166e (no longer maintained) -->
641  
642 <  <target name="jsr166xjar"
736 <          depends="jsr166xcompile"
737 <          description="Builds library jar from compiled sources">
642 > <!-- Find buglets that can be detected by static build tools -->
643  
644 <    <jar destfile="${jsr166x.jar}">
645 <      <fileset dir="${build.jsr166x.classes.dir}"/>
646 <    </jar>
644 > <!--   <target name="lint"> -->
645 > <!--     <antcall target="dists"> -->
646 > <!--       <param name="build.javadoc.access" value="protected"/> -->
647 > <!--     </antcall> -->
648 > <!--   </target> -->
649  
650 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
651 +  <target name="doclint-private">
652 +    <antcall target="dist">
653 +      <param name="build.javadoc.access" value="private"/>
654 +    </antcall>
655    </target>
656  
657  
658 + <!-- ==============================================================
659 +  Experimental errorprone support
660 +  https://errorprone.info
661 +  https://errorprone.info/docs/installation
662 +  https://github.com/google/error-prone/issues/1143
663 + =================================================================== -->
664 +  <path id="errorprone.processorpath.path">
665 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
666 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
667 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
668 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
669 +  </path>
670 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
671 +  <property name="errorprone.jsr166.user.flags" value=""/>
672 +  <property name="errorprone.jsr166.flags"
673 +            value="-Xep:HashtableContains:OFF
674 +                   -Xep:JdkObsolete:OFF
675 +                   -Xep:MissingOverride:OFF
676 +                   -Xep:MissingFail:OFF
677 +                   -Xep:ThreadPriorityCheck:OFF
678 +                   -Xep:MixedArrayDimensions:ERROR
679 +                   -Xep:RemoveUnusedImports:ERROR
680 +                   -Xep:EmptyIf:ERROR
681 +                   -Xep:MultipleTopLevelClasses:ERROR
682 +                   -Xep:ClassName:ERROR
683 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
684 +                   -Xep:RedundantThrows:ERROR
685 +                   -Xep:IdentityBinaryExpression:WARN
686 +                   -Xep:ConstructorInvokesOverridable:WARN
687 +                   -Xep:MethodCanBeStatic:WARN
688 +                   ${errorprone.jsr166.user.flags}"/>
689 +  <!-- -Xep:WildcardImport:ERROR -->
690 +  <property name="errorprone.jsr166.test.flags"
691 +            value="-Xep:StringSplitter:OFF
692 +                   -Xep:BoxedPrimitiveConstructor:OFF
693 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
694 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
695 +  <target name="errorprone"
696 +          depends="clean, configure-compiler"
697 +          description="Run errorprone over jsr166 source code (experimental)">
698 +
699 +    <local name="destdir"/>
700 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
701 +    <mkdir dir="${destdir}"/>
702  
703 <  <target name="jsr166xdocs"
704 <          description="Builds javadocs to dist dir">
749 <
750 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
751 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
752 <
753 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
754 <             packagenames="jsr166x.*"
755 <             link="${jdkapidocs.url}"
756 <             source="5"
757 <             bootclasspath="${bootclasspath6}"
758 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
759 <             executable="${javadoc7}"
760 <             additionalparam="-XDignore.symbol.file=true"/>
761 <
762 <  </target>
763 <
764 <
765 <  <target name="jsr166xdist"
766 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
767 <          description="Puts all distributable products in single hierarchy"/>
768 <
769 <
770 <
771 <  <target name="jsr166xclean"
772 <          description="Removes all jsr166x build products">
773 <
774 <    <delete dir="${build.jsr166x.dir}"/>
775 <
776 <  </target>
777 <
778 <
779 <
780 <  <target name="jsr166xdist-clean"
781 <          description="Removes all build and distribution products">
782 <
783 <  </target>
784 <
785 <
786 <  <target name="jsr166xdist-jar"
787 <          depends="jsr166xclean, jsr166xjar">
788 <
789 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
790 <
791 <  </target>
792 <
793 <  <!-- jsr166y -->
794 <
795 <
796 <  <target name="jsr166ycompile"
797 <          depends="configure-compiler"
798 <          description="Compiles jsr166y sources">
799 <
800 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
801 <
802 <    <javac srcdir="${topsrc.dir}"
803 <           destdir="${build.jsr166y.classes.dir}"
703 >    <javac srcdir="${src.dir}"
704 >           destdir="${destdir}"
705             debug="${build.debug}"
706             debuglevel="${build.debuglevel}"
707             deprecation="${build.deprecation}"
807           source="6"
708             classpath=""
809           bootclasspath="${bootclasspath6}"
709             includeAntRuntime="false"
710             includeJavaRuntime="false"
711 <           executable="${javac7}"
711 >           encoding="ASCII"
712 >           executable="${build.main.javac}"
713             fork="true">
714  
715 <      <include name="jsr166y/**/*.java"/>
716 <      <compilerarg line="${build.args}"/>
715 >      <include name="**/*.java"/>
716 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
717 >      <compilerarg value="-J--illegal-access=permit"/>
718 >      <compilerarg value="-XDcompilePolicy=simple"/>
719 >      <compilerarg value="-processorpath"/>
720 >      <compilerarg pathref="errorprone.processorpath.path"/>
721 >      <compilerarg value="-Xplugin:ErrorProne
722 >                          ${errorprone.jsr166.flags}"/>
723 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
724 >      <compilerarg value="-Xprefer:source"/>
725        <compilerarg value="-XDignore.symbol.file=true"/>
726        <compilerarg value="-Xlint:all"/>
727 <    </javac>
728 <  </target>
821 <
822 <
823 <  <target name="jsr166yjar"
824 <          depends="jsr166ycompile"
825 <          description="Builds library jar from compiled sources">
826 <
827 <    <jar destfile="${jsr166y.jar}" index="true">
828 <      <fileset dir="${build.jsr166y.classes.dir}"/>
829 <    </jar>
830 <
831 <  </target>
832 <
833 <
834 <
835 <  <target name="jsr166ydocs"
836 <          description="Builds javadocs to dist dir">
837 <
838 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
839 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840 <
841 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
842 <             packagenames="jsr166y.*"
843 <             link="${jdkapidocs.url}"
844 <             source="6"
845 <             bootclasspath="${bootclasspath6}"
846 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
847 <             executable="${javadoc7}"
848 <             additionalparam="-XDignore.symbol.file=true"/>
849 <
850 <  </target>
851 <
852 <
853 <  <target name="jsr166ydist"
854 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855 <          description="Puts all distributable products in single hierarchy"/>
856 <
857 <
858 <
859 <  <target name="jsr166yclean"
860 <          description="Removes all jsr166y build products">
861 <
862 <    <delete dir="${build.jsr166y.dir}"/>
863 <
864 <  </target>
865 <
866 <
867 <
868 <  <target name="jsr166ydist-clean"
869 <          description="Removes all build and distribution products">
870 <
871 <  </target>
872 <
873 <  <target name="jsr166ydist-jar"
874 <          depends="jsr166yclean, jsr166yjar">
875 <
876 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
877 <
878 <  </target>
879 <
880 <
881 <  <!-- extra166y -->
882 <
883 <
884 <  <target name="extra166ycompile"
885 <          depends="configure-compiler, jsr166yjar"
886 <          description="Compiles extra166y sources">
887 <
888 <    <mkdir dir="${build.extra166y.classes.dir}"/>
889 <
890 <    <javac srcdir="${topsrc.dir}"
891 <           destdir="${build.extra166y.classes.dir}"
892 <           debug="${build.debug}"
893 <           debuglevel="${build.debuglevel}"
894 <           deprecation="${build.deprecation}"
895 <           classpath=""
896 <           source="6"
897 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
898 <           includeAntRuntime="false"
899 <           includeJavaRuntime="false"
900 <           executable="${javac7}"
901 <           fork="true">
902 <
903 <      <include name="extra166y/**/*.java"/>
727 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
728 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
729        <compilerarg line="${build.args}"/>
905      <compilerarg value="-XDignore.symbol.file=true"/>
906      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
907
730      </javac>
731  
732 <  </target>
733 <
912 <
913 <
914 <  <target name="extra166yjar"
915 <          depends="extra166ycompile"
916 <          description="Builds library jar from compiled sources">
917 <
918 <    <jar destfile="${extra166y.jar}" index="true">
919 <      <fileset dir="${build.extra166y.classes.dir}"/>
920 <    </jar>
921 <
922 <  </target>
923 <
924 <
925 <
926 <  <target name="extra166ydocs"
927 <          description="Builds javadocs to build dir">
928 <
929 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
930 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931 <
932 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
933 <             packagenames="extra166y.*"
934 <             link="${jdkapidocs.url}"
935 <             source="6"
936 <             bootclasspath="${bootclasspath6}"
937 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
938 <             executable="${javadoc7}"
939 <             additionalparam="-XDignore.symbol.file=true"/>
940 <
941 <  </target>
942 <
943 <
944 <  <target name="extra166ydist"
945 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946 <          description="Puts all distributable products in single hierarchy"/>
947 <
948 <
949 <
950 <  <target name="extra166yclean"
951 <          description="Removes all extra166y build products">
952 <
953 <    <delete dir="${build.extra166y.dir}"/>
954 <
955 <  </target>
956 <
957 <
958 <
959 <  <target name="extra166ydist-clean"
960 <          description="Removes all build and distribution products">
961 <
962 <  </target>
963 <
964 <  <target name="extra166ydist-jar"
965 <          depends="extra166yclean, extra166yjar">
966 <
967 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
968 <
969 <  </target>
970 <
971 <  <!-- jsr166e -->
972 <
973 <  <target name="jsr166ecompile"
974 <          depends="configure-compiler"
975 <          description="Compiles jsr166e sources">
976 <
977 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
978 <
979 <    <javac srcdir="${topsrc.dir}"
980 <           destdir="${build.jsr166e.classes.dir}"
981 <           debug="${build.debug}"
982 <           debuglevel="${build.debuglevel}"
983 <           deprecation="${build.deprecation}"
984 <           source="7"
985 <           classpath=""
986 <           includeAntRuntime="false"
987 <           includeJavaRuntime="false"
988 <           executable="${javac7}"
989 <           fork="true">
990 <
991 <      <include name="jsr166e/**/*.java"/>
992 <      <compilerarg line="${build.args}"/>
993 <      <compilerarg value="-XDignore.symbol.file=true"/>
994 <      <compilerarg value="-Xlint:all"/>
995 <
996 <    </javac>
997 <
998 <  </target>
999 <
1000 <
1001 <
1002 <  <target name="jsr166ejar"
1003 <          depends="jsr166ecompile"
1004 <          description="Builds library jar from compiled sources">
1005 <
1006 <    <jar destfile="${jsr166e.jar}" index="true">
1007 <      <fileset dir="${build.jsr166e.classes.dir}"/>
732 >    <jar destfile="${product.jar}">
733 >      <fileset dir="${destdir}"/>
734      </jar>
735  
736 <  </target>
737 <
738 <
739 <
740 <  <target name="jsr166edocs"
741 <          description="Builds javadocs to build dir">
742 <
743 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
744 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
745 <
746 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
747 <             packagenames="jsr166e.*"
748 <             link="${jdkapidocs.url}"
749 <             source="7"
750 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
751 <             executable="${javadoc7}"
752 <             additionalparam="-XDignore.symbol.file=true" >
753 <    </javadoc>
754 <
755 <  </target>
756 <
757 <
758 <  <target name="jsr166edist"
759 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
760 <          description="Puts all distributable products in single hierarchy"/>
761 <
762 <
763 <
764 <  <target name="jsr166eclean"
765 <          description="Removes all jsr166e build products">
766 <
767 <    <delete dir="${build.jsr166e.dir}"/>
768 <
769 <  </target>
770 <
771 <
772 <  <target name="jsr166edist-clean"
773 <          description="Removes all build and distribution products">
774 <
775 <  </target>
776 <
777 <  <target name="jsr166edist-jar"
778 <          depends="jsr166eclean, jsr166ejar">
779 <
780 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
736 >    <run-tck-tests
737 >      target="${java.runtime.target}"
738 >      workdir="${build.dir}"
739 >      classes="${product.jar}">
740 >      <javac-elements>
741 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
742 >        <compilerarg value="-J--illegal-access=permit"/>
743 >        <compilerarg value="-XDcompilePolicy=simple"/>
744 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
745 >        <compilerarg value="-Xplugin:ErrorProne
746 >                            ${errorprone.jsr166.flags}
747 >                            ${errorprone.jsr166.test.flags}"/>
748 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
749 >      </javac-elements>
750 >    </run-tck-tests>
751 >  </target>
752 >
753 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
754 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
755 >  <target name="errorprone-jtreg"
756 >          depends="jar"
757 >          description="Run errorprone over jtreg tests (experimental)">
758 >
759 >    <run-jtreg-tests
760 >       target="${java.runtime.target}"
761 >       workdir="${build.dir}"
762 >       classes="${product.jar}"
763 >       verbose="all">
764 >      <jtreg-elements>
765 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
766 >        <arg value="-javacoption:-processorpath"/>
767 >        <arg value="-javacoption:${errorprone.processorpath}"/>
768 >        <arg value="-javacoption:-Xplugin:ErrorProne
769 >                            ${errorprone.jsr166.flags}
770 >                            ${errorprone.jsr166.test.flags}
771 >                            -Xep:MultipleTopLevelClasses:WARN
772 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
773 >      </jtreg-elements>
774 >    </run-jtreg-tests>
775 >  </target>
776 >
777 >
778 > <!-- ==============================================================
779 >  Running guava tests against jsr166 code
780 > =================================================================== -->
781 >
782 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
783 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
784 > <!-- <property name="guava.version" value="21.0"/> -->
785 >
786 > <!-- HOWTO debug print a path id -->
787 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
788 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
789 >
790 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
791 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
792 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
793 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
794 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
795 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
796 >
797 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
798 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
799 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
800 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
801 >
802 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
803 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
804 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
805 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
806 >
807 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
808 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
809 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
810 >
811 >  <target name="init-ivy">
812 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
813 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
814 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
815 >             classpath="${build.dir}/ivy.jar"/>
816 >  </target>
817 >
818 >  <target name="guava-tests" depends="jar, init-ivy"
819 >          description="Guava tests run against jsr166 collections">
820 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
821 >    <mkdir dir="${guava.dir}"/>
822 >    <ivy:retrieve pathid="guava.testlib.classpath"
823 >      type="jar,bundle" inline="true" conf="default,master"
824 >      pattern="${guava.dir}/[artifact].[ext]"
825 >      organisation="com.google.guava" module="guava-testlib"/>
826 >    <property name="guava.version" value="21.0"/>
827 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
828 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
829 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
830 >           jvm="${build.main.java}" fork="true">
831 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
832 >      <formatter type="brief"/>
833 >      <classpath>
834 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
835 >        <path refid="guava.testlib.classpath"/>
836 >      </classpath>
837  
838 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
839 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
840 +    </junit>
841    </target>
842  
843   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines