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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines