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.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC vs.
Revision 1.318 by jsr166, Wed Aug 12 14:13:43 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="1.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"/>
71  
72 <  <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 <  <!-- JDK binary locations -->
72 >  <!-- JDK locations -->
73    <property name="jdks.home"  location="${user.home}/jdk"/>
74  
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="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
83 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72 <    <property name="bootclasspath@{v}"
73 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
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 <  <defjdklocations v="6"/>
88 <  <defjdklocations v="7"/>
89 <  <defjdklocations v="8"/>
80 <
81 <  <macrodef name="run-tck-tests">
82 <    <attribute name="jvm"/>
83 <    <attribute name="tck.classes"/>
84 <    <attribute name="product.jar" default="${product.jar}"/>
85 <    <attribute name="jvmflags" default=""/>
87 >  <macrodef name="mirror-dir">
88 >    <attribute name="src"/>
89 >    <attribute name="dst"/>
90      <sequential>
91 <    <java classname="JSR166TestCase"
92 <          jvm="@{jvm}" fork="true">
93 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
94 <        <jvmarg line="@{jvmflags}"/>
95 <        <classpath>
92 <          <pathelement location="${junit.jar}"/>
93 <          <pathelement location="@{tck.classes}"/>
94 <        </classpath>
95 <    </java>
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="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"/>
112 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113 <
114 <  <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120 <  <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"/>
124  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
128    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
129  
130 <  <!-- Bootclasspath argument -->
131 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
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://download.java.net/java/early_access/jdk15/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    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153 <
154 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155 <  <!-- The below does not yet exist as of 2012-11 -->
156 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157 <
158 <  <!-- Default jdk api doc location (latest stable release seems best) -->
159 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
160 <
161 <  <!-- Test classpath -->
162 <  <path id="test.classpath">
163 <    <pathelement location="${build.testcases.dir}"/>
164 <    <pathelement location="${junit.jar}"/>
165 <  </path>
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 >  <!-- 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}"/>
174 >    <attribute name="target"/>
175 >    <attribute name="compile-target" default="@{target}"/>
176 >    <attribute name="workdir"/>
177 >    <attribute name="classes"/>
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"/>
187 >
188 >    <javac srcdir="@{tck.src.dir}"
189 >           destdir="@{workdir}/tck-classes"
190 >           debug="${build.debug}"
191 >           debuglevel="${build.debuglevel}"
192 >           deprecation="${build.deprecation}"
193 >           source="@{compile-target}"
194 >           target="@{compile-target}"
195 >           classpath="${junit.jar}"
196 >           includeAntRuntime="false"
197 >           includeJavaRuntime="false"
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,-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="${jsr166.tckTestClass}"
213 >          failonerror="true"
214 >          jvm="${java@{target}}"
215 >          fork="true">
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">
# Line 155 | Line 305
305    </path>
306  
307    <!-- Support @jls tag, used in jdk8+ javadoc -->
308 <  <!-- TODO: How do we get &trade to work? -->
309 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
160 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
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 line="${build.args}"/>
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"/>
360 <
361 < <!--
362 <      <exclude name="java/lang/**"/>
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}"/>
195      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
196 -->
371  
372      </javac>
199
373    </target>
374  
375  
203
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>
211
388    </target>
389  
390  
215
216  <target name="test"
217          depends="configure-tests, report-tests"
218          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
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}">
420 <      <arg value="-XDignore.symbol.file=true"/>
421 <      <arg value="-tag"/>
240 <      <arg value="${javadoc.jls.option}"/>
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="-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>
245
442    </target>
443  
444  
249
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  
255  <target name="release"
256          depends="dist"
257          description="Puts entire CVS tree, plus distribution productions, in a jar">
258
259    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
260
261    <jar basedir="${basedir}" destfile="${release.jar}">
262      <!-- <exclude name="build/**"/> -->
263      <exclude name="${release.jar}"/>
264      <exclude name="user.properties"/>
265      <exclude name="etc/notes/**"/>
266      <exclude name="src/emulation/**"/>
267      <exclude name="**/SyntaxTest.java"/>
268      <exclude name="**/SuperfluousAbstract.java"/>
269    </jar>
270
271  </target>
272
273
274
450    <target name="clean"
451            description="Removes all build products">
277
452      <delete dir="${build.dir}"/>
279
453    </target>
454  
455  
283
456    <target name="dist-clean"
457            description="Removes all build and distribution products">
458 <
458 >    <delete dir="${build.dir}"/>
459      <delete dir="${dist.dir}"/>
288
460    </target>
461  
462  
292
293  <!-- Internal targets -->
294
295
463    <target name="dist-jar"
464            depends="clean, jar">
298
465      <copy file="${product.jar}" todir="${dist.dir}"/>
300
466    </target>
467  
468 <
469 <  <target name="compile-tests"
470 <          depends="jar">
306 <
307 <    <mkdir dir="${build.testcases.dir}"/>
308 <
309 <    <javac srcdir="${tck.src.dir}"
310 <          destdir="${build.testcases.dir}"
311 <            debug="${build.debug}"
312 <       debuglevel="${build.debuglevel}"
313 <      deprecation="${build.deprecation}"
314 <           source="${build.sourcelevel}"
315 <             fork="true">
316 <
317 <      <compilerarg value="${bootclasspath.args}"/>
318 <      <compilerarg line="${build.args}"/>
319 <      <compilerarg value="-XDignore.symbol.file=true"/>
320 <
321 <      <classpath refid="test.classpath"/>
322 <
323 <    </javac>
324 <
325 <    <javac srcdir="${test.src.dir}"
326 <          destdir="${build.testcases.dir}"
327 <            debug="${build.debug}"
328 <       debuglevel="${build.debuglevel}"
329 <      deprecation="${build.deprecation}"
330 <           source="${build.sourcelevel}"
331 <             fork="true">
332 <
333 <      <include name="jsr166/test/**"/>
334 <
335 <      <compilerarg value="${bootclasspath.args}"/>
336 <      <compilerarg line="${build.args}"/>
337 <      <compilerarg value="-XDignore.symbol.file=true"/>
338 <
339 <      <classpath refid="test.classpath"/>
340 <
341 <    </javac>
342 <
343 < <!--
344 <    <javac srcdir="${jtreg.src.dir}"
345 <          destdir="${build.testcases.dir}"
346 <            debug="${build.debug}"
347 <       debuglevel="${build.debuglevel}"
348 <      deprecation="${build.deprecation}"
349 <           source="${build.sourcelevel}"
350 <             fork="true">
351 <
352 <      <compilerarg value="${bootclasspath.args}"/>
353 <      <compilerarg line="${build.args}"/>
354 <      <compilerarg value="-XDignore.symbol.file=true"/>
355 <
356 <      <classpath refid="test.classpath"/>
357 <
358 <    </javac>
359 < -->
360 <
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 <                   fork="true">
491 <
492 <      <jvmarg value="${bootclasspath.args}"/>
493 <      <jvmarg value="-server"/>
494 <      <jvmarg value="-showversion"/>
495 <
496 <      <classpath refid="test.classpath"/>
497 <
498 <      <formatter type="xml"/>
499 <
500 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
501 <        <fileset dir="${tck.src.dir}">
502 <          <include name="**/${testcase}Test.java"/>
503 <        </fileset>
504 <      </batchtest>
505 <
506 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
507 <        <fileset dir="${test.src.dir}">
508 <          <include name="jsr166/test/**/${testcase}Test.java"/>
509 <        </fileset>
510 <      </batchtest>
511 <
512 < <!--
513 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
514 <        <fileset dir="${jtreg.src.dir}">
402 <          <include name="**/${testcase}Test.java"/>
403 <        </fileset>
404 <      </batchtest>
405 < -->
406 <
407 <    </junit>
408 <
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 450 | Line 688
688    </target>
689  
690  
691 <  <target name="configure-tests"
692 <       depends="configure-compiler">
455 <
456 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
457 <    <available property="junit.available"
458 <               classname="junit.framework.Protectable"/>
459 <
460 <    <!-- Xalan -->
461 <    <available property="xalan.available"
462 <               classname="org.apache.xalan.Version"/>
463 <
464 <
465 <    <!-- Ant 1.6beta and later don't need or want this check -->
466 <    <!--
467 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
468 <          unless="junit.available"/>
469 <
470 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
471 <          unless="xalan.available"/>
472 <    -->
473 <
474 <  </target>
475 <
476 <
477 <  <!-- Various demos and test programs -->
478 <
479 <
480 <  <target name="loops" depends="configure-compiler"
481 <          description="Benchmark from Doug Lea's AQS paper">
482 <
483 <    <mkdir dir="${build.loops.dir}"/>
484 <
485 <    <javac srcdir="${loops.src.dir}"
486 <          destdir="${build.loops.dir}"
487 <            debug="${build.debug}"
488 <       debuglevel="${build.debuglevel}"
489 <      deprecation="${build.deprecation}"
490 <           source="${build.sourcelevel}"
491 <             fork="true">
492 <
493 <      <compilerarg line="${build.args}"/>
494 <      <classpath refid="loops.classpath"/>
495 <      <compilerarg value="-XDignore.symbol.file=true"/>
496 <
497 <    </javac>
498 <
499 <    <java classname="ALoops" fork="true">
500 <      <classpath refid="loops.classpath"/>
501 <    </java>
502 <
503 <  </target>
504 <
505 <
506 <  <!-- jsr166 4jdk7 -->
507 <
508 <
509 <  <target name="4jdk7compile"
510 <          depends="configure-compiler"
511 <          description="Compiles src/jdk7 sources, targeting jdk7">
691 >  <target name="compile-test-loops" depends="jar"
692 >          description="Compiles all the perf tests in src/test/loops">
693  
694 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
694 >    <mkdir dir="${build.dir}/test/loops"/>
695  
696 <    <javac srcdir="${4jdk7src.dir}"
697 <           destdir="${build.4jdk7.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}"
520           source="6"
521           classpath=""
522           bootclasspath="${bootclasspath6}"
523           includeAntRuntime="false"
524           includeJavaRuntime="false"
525           executable="${javac7}"
526           fork="true">
527
528      <include name="**/*.java"/>
529      <compilerarg line="${build.args}"/>
530      <compilerarg value="-XDignore.symbol.file=true"/>
531      <compilerarg value="-Xlint:all"/>
532
533    </javac>
534
535    <jar destfile="${4jdk7product.jar}" index="true">
536      <fileset dir="${build.4jdk7.classes.dir}"/>
537    </jar>
538
539    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
540
541    <javac srcdir="${tck.src.dir}"
542           destdir="${build.4jdk7.tck.classes.dir}"
543           debug="${build.debug}"
544           debuglevel="${build.debuglevel}"
545           deprecation="${build.deprecation}"
546           source="6"
547           classpath="${junit.jar}"
548           bootclasspath="${4jdk7product.jar}:${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="**/*.java"/>
555 <      <compilerarg line="${build.args}"/>
707 >      <include name="*.java"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>
709        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710 <
559 <    </javac>
560 <
561 <  </target>
562 <
563 <
564 <  <target name="4jdk7-test-tck"
565 <          depends="4jdk7compile"
566 <          description="Runs tck tests for jsr166-4jdk7 directly">
567 <    <run-tck-tests
568 <      jvm="${java7}"
569 <      tck.classes="${build.4jdk7.tck.classes.dir}"
570 <      product.jar="${4jdk7product.jar}"/>
571 <  </target>
572 <
573 <
574 <  <target name="4jdk7-test-tck-junit"
575 <          depends="4jdk7compile"
576 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
577 <
578 <    <junit printsummary="true"
579 <           showoutput="true"
580 <           errorProperty="junit.failed"
581 <           failureProperty="junit.failed"
582 <           includeantruntime="true"
583 <           jvm="${java7}"
584 <           fork="true">
585 <
586 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
587 <      <jvmarg value="-server"/>
588 <
589 <      <classpath>
590 <        <pathelement location="${junit.jar}"/>
591 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
592 <      </classpath>
593 <
594 <      <formatter type="brief"/>
595 <
596 <      <test name="JSR166TestCase" haltonfailure="no">
597 <      </test>
598 <
599 <    </junit>
600 <  </target>
601 <
602 <
603 <  <target name="4jdk7docs"
604 <          description="Builds javadocs for src/jdk7 to dist dir">
605 <
606 <    <delete dir="${dist.4jdk7.docs.dir}"/>
607 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
608 <
609 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
610 <             packagenames="none"
611 <             link="${jdkapi7docs.url}"
612 <             overview="${4jdk7src.dir}/intro.html"
613 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
614 <             classpath=""
615 <             executable="${javadoc7}">
616 <      <arg value="-XDignore.symbol.file=true"/>
617 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
618 <        <include name="**/*.java"/>
619 <      </fileset>
620 <    </javadoc>
621 <
622 <  </target>
623 <
624 <
625 <  <target name="4jdk7dist"
626 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
627 <          description="Puts all distributable products in single hierarchy"/>
628 <
629 <
630 <
631 <  <target name="4jdk7clean"
632 <          description="Removes all 4jdk7 build products">
633 <
634 <    <delete dir="${build.4jdk7.dir}"/>
635 <
636 <  </target>
637 <
638 <
639 <
640 <  <target name="4jdk7dist-clean"
641 <          description="Removes all build and distribution products">
642 <
643 <  </target>
644 <
645 <  <target name="4jdk7dist-jar"
646 <          depends="4jdk7clean, 4jdk7compile">
647 <
648 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
649 <
650 <  </target>
651 <
652 <
653 <  <!-- jsr166x -->
654 <
655 <  <target name="jsr166xcompile"
656 <          depends="configure-compiler"
657 <          description="Compiles jsr166x sources to build dir">
658 <
659 <    <mkdir dir="${build.jsr166x.dir}"/>
660 <
661 <    <javac srcdir="${topsrc.dir}"
662 <           destdir="${build.jsr166x.dir}"
663 <           debug="${build.debug}"
664 <           debuglevel="${build.debuglevel}"
665 <           deprecation="${build.deprecation}"
666 <           classpath=""
667 <           source="5"
668 <           bootclasspath="${bootclasspath6}"
669 <           includeAntRuntime="false"
670 <           includeJavaRuntime="false"
671 <           executable="${javac7}"
672 <           fork="true">
673 <
674 <      <include name="jsr166x/**/*.java"/>
710 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
711        <compilerarg line="${build.args}"/>
676      <compilerarg value="-XDignore.symbol.file=true"/>
677      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
678
712      </javac>
680
681  </target>
682
683
684
685  <target name="jsr166xjar"
686          depends="jsr166xcompile"
687          description="Builds library jar from compiled sources">
688
689    <jar destfile="${jsr166x.jar}">
690      <fileset dir="${build.jsr166x.dir}"/>
691    </jar>
692
693  </target>
694
695
696
697  <target name="jsr166xdocs"
698          description="Builds javadocs to dist dir">
699
700    <delete dir="${dist.jsr166xjavadocs.dir}"/>
701    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
702
703    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
704             packagenames="jsr166x.*"
705             link="${jdkapidocs.url}"
706             source="5"
707             bootclasspath="${bootclasspath6}"
708             sourcepath="${topsrc.dir}:${jdk6src.dir}"
709             executable="${javadoc7}"
710             additionalparam="-XDignore.symbol.file=true" />
711
712  </target>
713
714
715  <target name="jsr166xdist"
716          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
717          description="Puts all distributable products in single hierarchy"/>
718
719
720
721  <target name="jsr166xclean"
722          description="Removes all jsr166x build products">
723
724    <delete dir="${build.jsr166x.dir}"/>
725
713    </target>
714  
715  
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="jsr166xdist-clean"
731 <          description="Removes all build and distribution products">
732 <
733 <  </target>
734 <
724 > <!-- Find buglets that can be detected by static build tools -->
725  
726 <  <target name="jsr166xdist-jar"
727 <          depends="jsr166xclean, jsr166xjar">
728 <
729 <    <copy file="${jsr166x.jar}" todir="${dist.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  
743  <!-- jsr166y -->
744
739  
740 <  <target name="jsr166ycompile"
741 <          depends="configure-compiler"
742 <          description="Compiles jsr166y sources">
743 <
744 <    <mkdir dir="${build.jsr166y.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:ModifyingCollectionWithItself:OFF"/>
778 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
779 >  <target name="errorprone"
780 >          depends="clean, configure-compiler"
781 >          description="Run errorprone over jsr166 source code (experimental)">
782 >
783 >    <local name="destdir"/>
784 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
785 >    <mkdir dir="${destdir}"/>
786  
787 <    <javac srcdir="${topsrc.dir}"
788 <           destdir="${build.jsr166y.dir}"
787 >    <javac srcdir="${src.dir}"
788 >           destdir="${destdir}"
789             debug="${build.debug}"
790             debuglevel="${build.debuglevel}"
791             deprecation="${build.deprecation}"
757           source="6"
792             classpath=""
759           bootclasspath="${bootclasspath6}"
793             includeAntRuntime="false"
794             includeJavaRuntime="false"
795 <           executable="${javac7}"
795 >           encoding="ASCII"
796 >           executable="${build.main.javac}"
797             fork="true">
798  
799 <      <include name="jsr166y/**/*.java"/>
800 <      <compilerarg line="${build.args}"/>
799 >      <include name="**/*.java"/>
800 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
801 >      <compilerarg value="-J--illegal-access=permit"/>
802 >      <compilerarg value="-XDcompilePolicy=simple"/>
803 >      <compilerarg value="-processorpath"/>
804 >      <compilerarg pathref="errorprone.processorpath.path"/>
805 >      <compilerarg value="-Xplugin:ErrorProne
806 >                          ${errorprone.jsr166.flags}"/>
807 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
808 >      <compilerarg value="-Xprefer:source"/>
809        <compilerarg value="-XDignore.symbol.file=true"/>
810        <compilerarg value="-Xlint:all"/>
811 <    </javac>
812 <  </target>
771 <
772 <
773 <  <target name="jsr166yjar"
774 <          depends="jsr166ycompile"
775 <          description="Builds library jar from compiled sources">
776 <
777 <    <jar destfile="${jsr166y.jar}" index="true">
778 <      <fileset dir="${build.jsr166y.dir}"/>
779 <    </jar>
780 <
781 <  </target>
782 <
783 <
784 <
785 <  <target name="jsr166ydocs"
786 <          description="Builds javadocs to dist dir">
787 <
788 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
789 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
790 <
791 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
792 <             packagenames="jsr166y.*"
793 <             link="${jdkapidocs.url}"
794 <             source="6"
795 <             bootclasspath="${bootclasspath6}"
796 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
797 <             executable="${javadoc7}"
798 <             additionalparam="-XDignore.symbol.file=true" />
799 <
800 <  </target>
801 <
802 <
803 <  <target name="jsr166ydist"
804 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
805 <          description="Puts all distributable products in single hierarchy"/>
806 <
807 <
808 <
809 <  <target name="jsr166yclean"
810 <          description="Removes all jsr166y build products">
811 <
812 <    <delete dir="${build.jsr166y.dir}"/>
813 <
814 <  </target>
815 <
816 <
817 <
818 <  <target name="jsr166ydist-clean"
819 <          description="Removes all build and distribution products">
820 <
821 <  </target>
822 <
823 <  <target name="jsr166ydist-jar"
824 <          depends="jsr166yclean, jsr166yjar">
825 <
826 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
827 <
828 <  </target>
829 <
830 <
831 <  <!-- extra166y -->
832 <
833 <
834 <  <target name="extra166ycompile"
835 <          depends="configure-compiler, jsr166yjar"
836 <          description="Compiles extra166y sources">
837 <
838 <    <mkdir dir="${build.extra166y.dir}"/>
839 <
840 <    <javac srcdir="${topsrc.dir}"
841 <           destdir="${build.extra166y.dir}"
842 <           debug="${build.debug}"
843 <           debuglevel="${build.debuglevel}"
844 <           deprecation="${build.deprecation}"
845 <           classpath=""
846 <           source="6"
847 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
848 <           includeAntRuntime="false"
849 <           includeJavaRuntime="false"
850 <           executable="${javac7}"
851 <           fork="true">
852 <
853 <      <include name="extra166y/**/*.java"/>
811 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
812 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
813        <compilerarg line="${build.args}"/>
855      <compilerarg value="-XDignore.symbol.file=true"/>
856      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
857
814      </javac>
815  
816 <  </target>
817 <
862 <
863 <
864 <  <target name="extra166yjar"
865 <          depends="extra166ycompile"
866 <          description="Builds library jar from compiled sources">
867 <
868 <    <jar destfile="${extra166y.jar}" index="true">
869 <      <fileset dir="${build.extra166y.dir}"/>
870 <    </jar>
871 <
872 <  </target>
873 <
874 <
875 <
876 <  <target name="extra166ydocs"
877 <          description="Builds javadocs to build dir">
878 <
879 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
880 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
881 <
882 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
883 <             packagenames="extra166y.*"
884 <             link="${jdkapidocs.url}"
885 <             source="6"
886 <             bootclasspath="${bootclasspath6}"
887 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
888 <             executable="${javadoc7}"
889 <             additionalparam="-XDignore.symbol.file=true" />
890 <
891 <  </target>
892 <
893 <
894 <  <target name="extra166ydist"
895 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
896 <          description="Puts all distributable products in single hierarchy"/>
897 <
898 <
899 <
900 <  <target name="extra166yclean"
901 <          description="Removes all extra166y build products">
902 <
903 <    <delete dir="${build.extra166y.dir}"/>
904 <
905 <  </target>
906 <
907 <
908 <
909 <  <target name="extra166ydist-clean"
910 <          description="Removes all build and distribution products">
911 <
912 <  </target>
913 <
914 <  <target name="extra166ydist-jar"
915 <          depends="extra166yclean, extra166yjar">
916 <
917 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
918 <
919 <  </target>
920 <
921 <  <!-- jsr166e -->
922 <
923 <  <target name="jsr166ecompile"
924 <          depends="configure-compiler"
925 <          description="Compiles jsr166e sources">
926 <
927 <    <mkdir dir="${build.jsr166e.dir}"/>
928 <
929 <    <javac srcdir="${topsrc.dir}"
930 <           destdir="${build.jsr166e.dir}"
931 <           debug="${build.debug}"
932 <           debuglevel="${build.debuglevel}"
933 <           deprecation="${build.deprecation}"
934 <           source="7"
935 <           classpath=""
936 <           includeAntRuntime="false"
937 <           includeJavaRuntime="false"
938 <           executable="${javac7}"
939 <           fork="true">
940 <
941 <      <include name="jsr166e/**/*.java"/>
942 <      <compilerarg line="${build.args}"/>
943 <      <compilerarg value="-XDignore.symbol.file=true"/>
944 <      <compilerarg value="-Xlint:all"/>
945 <
946 <    </javac>
947 <
948 <  </target>
949 <
950 <
951 <
952 <  <target name="jsr166ejar"
953 <          depends="jsr166ecompile"
954 <          description="Builds library jar from compiled sources">
955 <
956 <    <jar destfile="${jsr166e.jar}" index="true">
957 <      <fileset dir="${build.jsr166e.dir}"/>
816 >    <jar destfile="${product.jar}">
817 >      <fileset dir="${destdir}"/>
818      </jar>
819  
820 <  </target>
821 <
822 <
823 <
824 <  <target name="jsr166edocs"
825 <          description="Builds javadocs to build dir">
826 <
827 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
828 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
829 <
830 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
831 <             packagenames="jsr166e.*"
832 <             link="${jdkapidocs.url}"
833 <             source="7"
834 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
835 <             executable="${javadoc7}"
836 <             additionalparam="-XDignore.symbol.file=true" >
837 <    </javadoc>
838 <
839 <  </target>
840 <
841 <
842 <  <target name="jsr166edist"
843 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
844 <          description="Puts all distributable products in single hierarchy"/>
845 <
846 <
847 <
848 <  <target name="jsr166eclean"
849 <          description="Removes all jsr166e build products">
850 <
851 <    <delete dir="${build.jsr166e.dir}"/>
852 <
853 <  </target>
854 <
855 <
856 <  <target name="jsr166edist-clean"
857 <          description="Removes all build and distribution products">
858 <
859 <  </target>
860 <
861 <  <target name="jsr166edist-jar"
862 <          depends="jsr166eclean, jsr166ejar">
863 <
864 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
820 >    <run-tck-tests
821 >      target="${java.runtime.target}"
822 >      workdir="${build.dir}"
823 >      classes="${product.jar}">
824 >      <javac-elements>
825 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
826 >        <compilerarg value="-J--illegal-access=permit"/>
827 >        <compilerarg value="-XDcompilePolicy=simple"/>
828 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
829 >        <compilerarg value="-Xplugin:ErrorProne
830 >                            ${errorprone.jsr166.flags}
831 >                            ${errorprone.jsr166.test.flags}"/>
832 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
833 >      </javac-elements>
834 >    </run-tck-tests>
835 >  </target>
836 >
837 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
838 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
839 >  <target name="errorprone-jtreg"
840 >          depends="jar"
841 >          description="Run errorprone over jtreg tests (experimental)">
842 >
843 >    <run-jtreg-tests
844 >       target="${java.runtime.target}"
845 >       workdir="${build.dir}"
846 >       classes="${product.jar}"
847 >       verbose="all">
848 >      <jtreg-elements>
849 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
850 >        <arg value="-javacoption:-processorpath"/>
851 >        <arg value="-javacoption:${errorprone.processorpath}"/>
852 >        <arg value="-javacoption:-Xplugin:ErrorProne
853 >                            ${errorprone.jsr166.flags}
854 >                            ${errorprone.jsr166.test.flags}
855 >                            -Xep:MultipleTopLevelClasses:WARN
856 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
857 >      </jtreg-elements>
858 >    </run-jtreg-tests>
859 >  </target>
860 >
861 >
862 > <!-- ==============================================================
863 >  Running guava tests against jsr166 code
864 > =================================================================== -->
865 >
866 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
867 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
868 > <!-- <property name="guava.version" value="21.0"/> -->
869 >
870 > <!-- HOWTO debug print a path id -->
871 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
872 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
873 >
874 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
875 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
876 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
877 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
878 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
879 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
880 >
881 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
882 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
883 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
884 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
885 >
886 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
887 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
888 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
889 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
890 >
891 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
892 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
893 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
894 >
895 >  <target name="init-ivy">
896 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
897 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
898 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
899 >             classpath="${build.dir}/ivy.jar"/>
900 >  </target>
901 >
902 >  <target name="guava-tests" depends="jar, init-ivy"
903 >          description="Guava tests run against jsr166 collections">
904 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
905 >    <mkdir dir="${guava.dir}"/>
906 >    <ivy:retrieve pathid="guava.testlib.classpath"
907 >      type="jar,bundle" inline="true" conf="default,master"
908 >      pattern="${guava.dir}/[artifact].[ext]"
909 >      organisation="com.google.guava" module="guava-testlib"/>
910 >    <property name="guava.version" value="21.0"/>
911 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
912 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
913 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
914 >           jvm="${build.main.java}" fork="true">
915 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
916 >      <formatter type="brief"/>
917 >      <classpath>
918 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
919 >        <path refid="guava.testlib.classpath"/>
920 >      </classpath>
921  
922 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
923 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
924 +    </junit>
925    </target>
926  
927   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines