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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines