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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines