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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.311 by jsr166, Mon Mar 2 19:36:41 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    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 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
33 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
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 <  <target name="usage" description="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 -->
41  <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  
47  <!-- Tck options; see JSR166TestCase.java -->
48  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49  <property name="jsr166.profileTests"     value="false"/>
50  <property name="jsr166.profileThreshold" value="100"/>
51  <property name="jsr166.runsPerTest"      value="1"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
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"/>
61  <property name="build.reports.dir"           location="${build.dir}/reports"/>
62
63  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
67
68  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
69  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
70  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76  <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 81 | Line 73 | As of 2013-02, the very latest lambda 8
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"/>
90 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91 <    <path id="bootclasspath@{v}">
92 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
93 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
94 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
95 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
96 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
97 <    </path>
98 <    <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 111 | Line 94 | As of 2013-02, the very latest lambda 8
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
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"/>
127  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
128  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
129  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131  <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"/>
136 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140 <
141 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146 <  <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"/>
150  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154  <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 API docs, to use with javadoc link attribute -->
127 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
128 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
129 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
130 <
131 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
132 <  <!-- The below does not yet exist as of 2013-01 -->
133 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
126 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
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://download.java.net/java/early_access/jdk14/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 <  <!-- Default jdk api doc location (latest stable release seems best) -->
145 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
144 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
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 -->
153    <!-- See the docs in "jtreg -onlineHelp" -->
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 197 | Line 187 | As of 2013-02, the very latest lambda 8
187             source="@{compile-target}"
188             target="@{compile-target}"
189             classpath="${junit.jar}"
200           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 215 | Line 207 | As of 2013-02, the very latest lambda 8
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}"/>
234 <    <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"/>
242 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
243 <    <mkdir dir="@{workdir}/JTreport"/>
244 <    <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 263 | Line 298 | As of 2013-02, the very latest lambda 8
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 +  <!-- 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 <           executable="${javac8}"
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"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
356 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
357 >      <compilerarg value="-Werror"/>
358 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
360  
361      </javac>
# Line 301 | Line 364 | As of 2013-02, the very latest lambda 8
364  
365    <target name="jar"
366            depends="compile"
367 <          description="Builds library jar from compiled sources">
368 <
367 >          description="Builds library jar for src/main from compiled sources">
368 >    <local name="subdir"/>
369 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
370      <jar destfile="${product.jar}">
371 <      <fileset dir="${build.classes.dir}"/>
371 >      <fileset dir="${build.classes.dir}${subdir}"/>
372 >      <manifest>
373 >        <attribute name="Built-By" value="${user.name}"/>
374 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
375 >      </manifest>
376      </jar>
377    </target>
378  
379  
312  <target name="test"
313          depends="configure-tests, report-tests"
314          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315
316
380    <target name="docs"
381            description="Builds javadocs for src/main to dist dir">
382  
383 <    <delete dir="${docs.dir}"/>
383 >    <delete dir="${docs.dir}" quiet="true"/>
384      <mkdir dir="${docs.dir}"/>
385  
386 +    <!-- old school frames via docs/index.html?overview-summary.html -->
387 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
388 +    <local name="use-frames"/>
389 +    <condition property="use-frames">
390 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
391 +    </condition>
392 +
393      <!-- the packagenames="none" hack below prevents scanning the -->
394      <!-- sourcepath for packages -->
395  
396 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
397 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
398 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
399 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
400 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
401      <javadoc destdir="${docs.dir}"
402               packagenames="none"
403 <             link="${jdkapi8docs.url}"
403 >             link="${java.api.url}"
404               overview="${src.dir}/intro.html"
405               access="${build.javadoc.access}"
406 <             sourcepath="${src.dir}:${jdk8src.dir}"
406 >             sourcepath="${src.dir}"
407               classpath=""
408 <             executable="${javadoc8}">
408 >             source="${build.main.javadoc.source}"
409 >             executable="${build.main.javadoc}">
410 > <!-- TODO: JDK-8214571 failonerror = "true" -->
411        <fileset dir="${src.dir}" defaultexcludes="yes">
412          <include name="**/*.java"/>
413        </fileset>
414 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
415 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
416 +      <arg value="-quiet"/>
417        <arg value="-XDignore.symbol.file=true"/>
418 <      <arg value="-tag"/>
419 <      <arg value="${javadoc.jls.option}"/>
418 >      <arg value="-html5"/>
419 >      <arg value="--patch-module=java.base=${src.dir}"/>
420 >      <arg value="--frames" if:set="use-frames"/>
421 >      <arg value="--override-methods=summary"/>
422 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
423 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
424 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
425 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
426 > <!-- tags added in jdk9: currently unused -->
427 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
430    </target>
431  
# Line 346 | Line 435 | As of 2013-02, the very latest lambda 8
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
349  <target name="release"
350          depends="dist"
351          description="Puts entire CVS tree, plus distribution productions, in a jar">
352
353    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
354
355    <jar basedir="${basedir}" destfile="${release.jar}">
356      <!-- <exclude name="build/**"/> -->
357      <exclude name="${release.jar}"/>
358      <exclude name="user.properties"/>
359      <exclude name="etc/notes/**"/>
360      <exclude name="src/emulation/**"/>
361      <exclude name="**/SyntaxTest.java"/>
362      <exclude name="**/SuperfluousAbstract.java"/>
363    </jar>
364  </target>
365
366
438    <target name="clean"
439            description="Removes all build products">
369
440      <delete dir="${build.dir}"/>
371
441    </target>
442  
443  
444    <target name="dist-clean"
445            description="Removes all build and distribution products">
446 <
446 >    <delete dir="${build.dir}"/>
447      <delete dir="${dist.dir}"/>
379
448    </target>
449  
450  
383  <!-- Internal targets -->
384
385
451    <target name="dist-jar"
452            depends="clean, jar">
453      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 393 | Line 458 | As of 2013-02, the very latest lambda 8
458      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
459    </target>
460  
461 <
462 <  <target name="compile-tests"
463 <          depends="jar">
399 <
400 <    <mkdir dir="${build.testcases.dir}"/>
401 <
402 <    <javac srcdir="${tck.src.dir}"
403 <           destdir="${build.testcases.dir}"
404 <           debug="${build.debug}"
405 <           debuglevel="${build.debuglevel}"
406 <           deprecation="${build.deprecation}"
407 <           source="6"
408 <           classpath="${junit.jar}"
409 <           bootclasspath="@{product.jar}:${bootclasspath6}"
410 <           includeAntRuntime="false"
411 <           includeJavaRuntime="false"
412 <           executable="${javac8}"
413 <           fork="true">
414 <
415 <      <include name="**/*.java"/>
416 <      <compilerarg value="-XDignore.symbol.file=true"/>
417 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418 <      <compilerarg line="${build.args}"/>
419 <
420 <    </javac>
421 <
422 <    <javac srcdir="${test.src.dir}"
423 <           destdir="${build.testcases.dir}"
424 <           debug="${build.debug}"
425 <           debuglevel="${build.debuglevel}"
426 <           deprecation="${build.deprecation}"
427 <           source="6"
428 <           classpath=""
429 <           bootclasspath="@{product.jar}:${bootclasspath6}"
430 <           includeAntRuntime="false"
431 <           includeJavaRuntime="false"
432 <           executable="${javac8}"
433 <           fork="true">
434 <
435 <      <include name="jsr166/test/**/*.java"/>
436 <      <compilerarg value="-XDignore.symbol.file=true"/>
437 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438 <      <compilerarg line="${build.args}"/>
439 <
440 <    </javac>
441 <
442 < <!--
443 <    <javac srcdir="${jtreg.src.dir}"
444 <          destdir="${build.testcases.dir}"
445 <            debug="${build.debug}"
446 <       debuglevel="${build.debuglevel}"
447 <      deprecation="${build.deprecation}"
448 <           source="${build.sourcelevel}"
449 <             fork="true">
450 <
451 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452 <      <compilerarg value="-XDignore.symbol.file=true"/>
453 <      <compilerarg line="${build.args}"/>
454 <
455 <    </javac>
456 < -->
457 <
458 <  </target>
459 <
460 <  <target name="test-tck"
461 <          depends="jar"
462 <          description="Runs tck tests for main directly">
461 >  <target name="tck"
462 >          depends="jar"
463 >          description="Runs tck tests for src/main directly">
464  
465      <run-tck-tests
466 <      target="8"
466 >      target="${java.runtime.target}"
467        workdir="${build.dir}"
468 <      classes="${product.jar}"/>
468 <  </target>
469 <
470 <  <target name="test-jtreg"
471 <          depends="jar"
472 <          description="Runs jtreg tests for main using the jtreg ant task">
473 <    <run-jtreg-tests
474 <       target="8"
475 <       workdir="${build.dir}"
476 <       classes="${product.jar}"/>
477 <  </target>
478 <
479 <  <target name="test-ng"
480 <          depends="test-tck, test-jtreg"
481 <          description="Runs tck and jtreg tests for main">
482 <  </target>
483 <
484 <  <target name="run-tests"
485 <          depends="compile-tests">
486 <
487 <    <!-- May be overridden by user.properties -->
488 <    <property name="testcase" value="*"/>
489 <
490 <    <mkdir dir="${build.reports.dir}"/>
491 <
492 <    <junit printsummary="true"
493 <             showoutput="true"
494 <          errorProperty="junit.failed"
495 <        failureProperty="junit.failed"
496 <                    dir="${build.reports.dir}"
497 <                    jvm="${java8}"
498 <                   fork="true">
499 <
500 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501 <      <jvmarg value="-server"/>
502 <      <jvmarg value="-showversion"/>
503 <
504 <      <classpath refid="test.classpath"/>
505 <
506 <      <formatter type="xml"/>
507 <
508 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
509 <        <fileset dir="${tck.src.dir}">
510 <          <include name="**/${testcase}Test.java"/>
511 <        </fileset>
512 <      </batchtest>
513 <
514 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
515 <        <fileset dir="${test.src.dir}">
516 <          <include name="jsr166/test/**/${testcase}Test.java"/>
517 <        </fileset>
518 <      </batchtest>
519 <
520 < <!--
521 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522 <        <fileset dir="${jtreg.src.dir}">
523 <          <include name="**/${testcase}Test.java"/>
524 <        </fileset>
525 <      </batchtest>
526 < -->
527 <
528 <    </junit>
529 <
530 <  </target>
531 <
532 <
533 <  <target name="report-tests"
534 <          depends="run-tests">
535 <
536 <    <!-- Sets junit.report.format to frames if redirection is present,
537 <         otherwise sets it to noframes. -->
538 <    <available property="junit.report.format"
539 <                  value="frames"
540 <              classname="org.apache.xalan.lib.Redirect"
541 <    />
542 <    <property name="junit.report.format" value="noframes"/>
543 <
544 <    <junitreport todir="${build.reports.dir}">
545 <      <fileset dir="${build.reports.dir}">
546 <        <include name="TEST-*.xml"/>
547 <      </fileset>
548 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
549 <      />
550 <    </junitreport>
551 <
552 <    <fail message="Test Cases Failed" if="junit.failed"/>
553 <
554 <  </target>
555 <
556 <
557 <  <target name="configure-compiler">
558 <
559 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
560 <
561 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
562 <      <istrue value="${build.warnunchecked}"/>
563 <    </condition>
564 <
565 <    <property name="warnunchecked.arg" value=""/>
566 <
567 <
568 <    <!-- Common options in javac invocations -->
569 <    <property name="build.args" value="${warnunchecked.arg}"/>
570 <
571 <  </target>
572 <
573 <
574 <  <target name="configure-tests"
575 <       depends="configure-compiler">
576 <
577 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578 <    <available property="junit.available"
579 <               classname="junit.framework.Protectable"/>
580 <
581 <    <!-- Xalan -->
582 <    <available property="xalan.available"
583 <               classname="org.apache.xalan.Version"/>
584 <
585 <
586 <    <!-- Ant 1.6beta and later don't need or want this check -->
587 <    <!--
588 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589 <          unless="junit.available"/>
590 <
591 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592 <          unless="xalan.available"/>
593 <    -->
594 <
595 <  </target>
596 <
597 <
598 <  <!-- Various demos and test programs -->
599 <
600 <
601 <  <target name="loops" depends="configure-compiler"
602 <          description="Benchmark from Doug Lea's AQS paper">
603 <
604 <    <mkdir dir="${build.loops.dir}"/>
605 <
606 <    <javac srcdir="${loops.src.dir}"
607 <          destdir="${build.loops.dir}"
608 <            debug="${build.debug}"
609 <       debuglevel="${build.debuglevel}"
610 <      deprecation="${build.deprecation}"
611 <           source="${build.sourcelevel}"
612 <             fork="true">
613 <
614 <      <compilerarg line="${build.args}"/>
615 <      <classpath refid="loops.classpath"/>
616 <      <compilerarg value="-XDignore.symbol.file=true"/>
617 <
618 <    </javac>
619 <
620 <    <java classname="ALoops" fork="true">
621 <      <classpath refid="loops.classpath"/>
622 <    </java>
623 <
624 <  </target>
625 <
626 <
627 <  <!-- jsr166 4jdk7 -->
628 <
629 <  <target name="4jdk7compile"
630 <          depends="configure-compiler"
631 <          description="Compiles src/jdk7 sources, targeting jdk7">
632 <
633 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
634 <
635 <    <javac srcdir="${4jdk7src.dir}"
636 <           destdir="${build.4jdk7.classes.dir}"
637 <           debug="${build.debug}"
638 <           debuglevel="${build.debuglevel}"
639 <           deprecation="${build.deprecation}"
640 <           source="6"
641 <           classpath=""
642 <           bootclasspath="${bootclasspath6}"
643 <           includeAntRuntime="false"
644 <           includeJavaRuntime="false"
645 <           executable="${javac7}"
646 <           fork="true">
647 <
648 <      <include name="**/*.java"/>
649 <      <compilerarg value="-Xprefer:source"/>
650 <      <compilerarg value="-XDignore.symbol.file=true"/>
651 <      <compilerarg value="-Xlint:all"/>
652 <      <compilerarg line="${build.args}"/>
653 <
654 <    </javac>
655 <  </target>
656 <
657 <
658 <  <target name="4jdk7jar"
659 <          depends="4jdk7compile"
660 <          description="Builds library jar from compiled sources">
661 <
662 <    <jar destfile="${4jdk7product.jar}">
663 <      <fileset dir="${build.4jdk7.classes.dir}"/>
664 <    </jar>
665 <
666 <  </target>
667 <
668 <
669 <  <target name="4jdk7-test-tck"
670 <          depends="4jdk7jar"
671 <          description="Runs tck tests for jsr166-4jdk7 directly">
672 <
673 <    <run-tck-tests
674 <      target="7"
675 <      workdir="${build.4jdk7.dir}"
676 <      classes="${4jdk7product.jar}">
468 >      classes="${product.jar}">
469        <javac-elements>
470 <        <!-- JDK8+ test classes -->
679 <        <exclude name="*8Test.java"/>
680 <        <exclude name="DoubleAccumulatorTest.java"/>
681 <        <exclude name="DoubleAdderTest.java"/>
682 <        <exclude name="LongAccumulatorTest.java"/>
683 <        <exclude name="LongAdderTest.java"/>
684 <        <exclude name="CompletableFutureTest.java"/>
685 <        <exclude name="StampedLockTest.java"/>
470 >        <compilerarg value="-Werror"/>
471        </javac-elements>
472      </run-tck-tests>
473    </target>
474  
475 <
476 <  <target name="4jdk7-test-tck-junit"
477 <          depends="4jdk7compile"
478 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
479 <
695 <    <junit printsummary="true"
696 <           showoutput="true"
697 <           errorProperty="junit.failed"
698 <           failureProperty="junit.failed"
699 <           includeantruntime="true"
700 <           jvm="${java7}"
701 <           fork="true">
702 <
703 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
704 <      <jvmarg value="-server"/>
705 <
706 <      <classpath>
707 <        <pathelement location="${junit.jar}"/>
708 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
709 <      </classpath>
710 <
711 <      <formatter type="brief"/>
712 <
713 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
714 <      </test>
715 <
716 <    </junit>
717 <  </target>
718 <
719 <  <target name="4jdk7-test-jtreg"
720 <          depends="4jdk7jar"
721 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722 <    <run-jtreg-tests
723 <       target="7"
724 <       workdir="${build.4jdk7.dir}"
725 <       classes="${4jdk7product.jar}"/>
726 <  </target>
727 <
728 <
729 <  <target name="4jdk7-test"
730 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
731 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
732 <  </target>
733 <
734 <
735 <  <target name="4jdk7docs"
736 <          description="Builds javadocs for src/jdk7 to dist dir">
737 <
738 <    <delete dir="${4jdk7docs.dir}"/>
739 <    <mkdir dir="${4jdk7docs.dir}"/>
740 <
741 <    <javadoc destdir="${4jdk7docs.dir}"
742 <             packagenames="none"
743 <             link="${jdkapi7docs.url}"
744 <             overview="${4jdk7src.dir}/intro.html"
745 <             access="${build.javadoc.access}"
746 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
747 <             classpath=""
748 <             executable="${javadoc7}">
749 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
750 <        <include name="**/*.java"/>
751 <      </fileset>
752 <      <arg value="-XDignore.symbol.file=true"/>
753 <    </javadoc>
754 <  </target>
755 <
756 <
757 <  <target name="4jdk7dist"
758 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
759 <          description="Puts all distributable products in single hierarchy"/>
760 <
761 <
762 <  <target name="4jdk7clean"
763 <          description="Removes all 4jdk7 build products">
764 <
765 <    <delete dir="${build.4jdk7.dir}"/>
766 <
767 <  </target>
768 <
769 <
770 <  <target name="4jdk7dist-clean"
771 <          description="Removes all build and distribution products">
772 <
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with common pool parallelism 1">
477 >    <antcall target="tck">
478 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479 >    </antcall>
480    </target>
481  
482 <  <target name="4jdk7dist-jar"
483 <          depends="4jdk7clean, 4jdk7jar">
484 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with common pool parallelism 0">
484 >    <antcall target="tck">
485 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486 >    </antcall>
487    </target>
488  
489 <
490 <  <target name="4jdk7dist-docs"
491 <          depends="4jdk7clean, 4jdk7docs">
492 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
489 >  <target name="tck-security-manager"
490 >          description="Runs tck with a security manager">
491 >    <antcall target="tck">
492 >      <param name="jsr166.useSecurityManager" value="true"/>
493 >    </antcall>
494    </target>
495  
496 <
497 <  <!-- jsr166x -->
498 <
499 <  <target name="jsr166xcompile"
500 <          depends="configure-compiler"
501 <          description="Compiles jsr166x sources to build dir">
502 <
793 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
794 <
795 <    <javac srcdir="${topsrc.dir}"
796 <           destdir="${build.jsr166x.classes.dir}"
797 <           debug="${build.debug}"
798 <           debuglevel="${build.debuglevel}"
799 <           deprecation="${build.deprecation}"
800 <           classpath=""
801 <           bootclasspath="${bootclasspath6}"
802 <           source="5"
803 <           includeAntRuntime="false"
804 <           includeJavaRuntime="false"
805 <           executable="${javac7}"
806 <           fork="true">
807 <
808 <      <include name="jsr166x/**/*.java"/>
809 <      <compilerarg value="-XDignore.symbol.file=true"/>
810 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
811 <      <compilerarg line="${build.args}"/>
812 <
813 <    </javac>
496 >  <target name="jtreg"
497 >          depends="jar"
498 >          description="Runs jtreg tests for src/main using the jtreg ant task">
499 >    <run-jtreg-tests
500 >       target="${java.runtime.target}"
501 >       workdir="${build.dir}"
502 >       classes="${product.jar}"/>
503    </target>
504  
505 +  <target name="test"
506 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
507 +          description="Runs tck and jtreg tests for src/main"/>
508  
509 <  <target name="jsr166xjar"
510 <          depends="jsr166xcompile"
511 <          description="Builds library jar from compiled sources">
512 <
513 <    <jar destfile="${jsr166x.jar}">
514 <      <fileset dir="${build.jsr166x.classes.dir}"/>
515 <    </jar>
516 <
509 >  <target name="test-version-permutations"
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
511 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
512 >
513 >  <target name="test11">
514 >    <antcall>
515 >      <param name="java.runtime.target" value="11"/>
516 >      <param name="build.main.javac" value="${javac11}"/>
517 >      <param name="build.main.javadoc" value="${javadoc12}"/>
518 >      <param name="build.main.javadoc.source" value="11"/>
519 >      <target name="clean"/>
520 >      <target name="test"/>
521 >      <target name="docs"/>
522 >    </antcall>
523    </target>
524  
525 <
526 <  <target name="jsr166xdocs"
527 <          description="Builds javadocs to dist dir">
528 <
529 <    <delete dir="${jsr166xdocs.dir}"/>
530 <    <mkdir dir="${jsr166xdocs.dir}"/>
531 <
532 <    <javadoc destdir="${jsr166xdocs.dir}"
533 <             packagenames="jsr166x.*"
534 <             link="${jdkapidocs.url}"
837 <             access="${build.javadoc.access}"
838 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
839 <             bootclasspath="${bootclasspath6}"
840 <             source="5"
841 <             executable="${javadoc7}">
842 <      <arg value="-XDignore.symbol.file=true"/>
843 <
844 <    </javadoc>
525 >  <target name="test12">
526 >    <antcall>
527 >      <param name="java.runtime.target" value="12"/>
528 >      <param name="build.main.javac" value="${javac12}"/>
529 >      <param name="build.main.javadoc" value="${javadoc12}"/>
530 >      <param name="build.main.javadoc.source" value="12"/>
531 >      <target name="clean"/>
532 >      <target name="test"/>
533 >      <target name="docs"/>
534 >    </antcall>
535    </target>
536  
537 <
538 <  <target name="jsr166xdist"
539 <          depends="jsr166xdist-jar, jsr166xdist-docs"
540 <          description="Puts all distributable products in single hierarchy"/>
541 <
542 <
543 <  <target name="jsr166xclean"
544 <          description="Removes all jsr166x build products">
545 <
546 <    <delete dir="${build.jsr166x.dir}"/>
857 <
537 >  <target name="test13">
538 >    <antcall>
539 >      <param name="java.runtime.target" value="13"/>
540 >      <param name="build.main.javac" value="${javac13}"/>
541 >      <param name="build.main.javadoc" value="${javadoc13}"/>
542 >      <param name="build.main.javadoc.source" value="13"/>
543 >      <target name="clean"/>
544 >      <target name="test"/>
545 >      <target name="docs"/>
546 >    </antcall>
547    </target>
548  
549 <
550 <  <target name="jsr166xdist-clean"
551 <          description="Removes all build and distribution products">
552 <
549 >  <target name="test14">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="14"/>
552 >      <param name="build.main.javac" value="${javac14}"/>
553 >      <param name="build.main.javadoc" value="${javadoc14}"/>
554 >      <param name="build.main.javadoc.source" value="14"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558 >    </antcall>
559    </target>
560  
561 <
562 <  <target name="jsr166xdist-jar"
563 <          depends="jsr166xclean, jsr166xjar">
564 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
561 >  <target name="test15">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="15"/>
564 >      <param name="build.main.javac" value="${javac15}"/>
565 >      <param name="build.main.javadoc" value="${javadoc15}"/>
566 >      <param name="build.main.javadoc.source" value="15"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571    </target>
572  
573 <  <target name="jsr166xdist-docs"
574 <          depends="jsr166xclean, jsr166xdocs">
575 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
573 >  <target name="test11-12">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="12"/>
576 >      <param name="build.main.javac" value="${javac11}"/>
577 >      <param name="build.main.javadoc" value="${javadoc12}"/>
578 >      <param name="build.main.javadoc.source" value="11"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582 >    </antcall>
583    </target>
584  
585 <  <!-- jsr166y -->
586 <
587 <
588 <  <target name="jsr166ycompile"
589 <          depends="configure-compiler"
590 <          description="Compiles jsr166y sources">
591 <
592 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
593 <
594 <    <javac srcdir="${topsrc.dir}"
887 <           destdir="${build.jsr166y.classes.dir}"
888 <           debug="${build.debug}"
889 <           debuglevel="${build.debuglevel}"
890 <           deprecation="${build.deprecation}"
891 <           source="6"
892 <           classpath=""
893 <           bootclasspath="${bootclasspath6}"
894 <           includeAntRuntime="false"
895 <           includeJavaRuntime="false"
896 <           executable="${javac7}"
897 <           fork="true">
898 <
899 <      <include name="jsr166y/**/*.java"/>
900 <      <compilerarg value="-XDignore.symbol.file=true"/>
901 <      <compilerarg value="-Xlint:all"/>
902 <      <compilerarg line="${build.args}"/>
903 <
904 <    </javac>
585 >  <target name="test11-13">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="13"/>
588 >      <param name="build.main.javac" value="${javac11}"/>
589 >      <param name="build.main.javadoc" value="${javadoc13}"/>
590 >      <param name="build.main.javadoc.source" value="11"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595    </target>
596  
597 <
598 <  <target name="jsr166yjar"
599 <          depends="jsr166ycompile"
600 <          description="Builds library jar from compiled sources">
601 <
602 <    <jar destfile="${jsr166y.jar}" index="true">
603 <      <fileset dir="${build.jsr166y.classes.dir}"/>
604 <    </jar>
605 <
597 >  <target name="test11-14">
598 >    <antcall>
599 >      <param name="java.runtime.target" value="14"/>
600 >      <param name="build.main.javac" value="${javac11}"/>
601 >      <param name="build.main.javadoc" value="${javadoc14}"/>
602 >      <param name="build.main.javadoc.source" value="11"/>
603 >      <target name="clean"/>
604 >      <target name="test"/>
605 >      <target name="docs"/>
606 >    </antcall>
607    </target>
608  
609 <
610 <  <target name="jsr166ydocs"
611 <          description="Builds javadocs to dist dir">
612 <
613 <    <delete dir="${jsr166ydocs.dir}"/>
614 <    <mkdir dir="${jsr166ydocs.dir}"/>
615 <
616 <    <javadoc destdir="${jsr166ydocs.dir}"
617 <             packagenames="jsr166y.*"
618 <             link="${jdkapidocs.url}"
928 <             access="${build.javadoc.access}"
929 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
930 <             bootclasspath="${bootclasspath6}"
931 <             source="6"
932 <             executable="${javadoc7}">
933 <      <arg value="-XDignore.symbol.file=true"/>
934 <
935 <    </javadoc>
609 >  <target name="test11-15">
610 >    <antcall>
611 >      <param name="java.runtime.target" value="15"/>
612 >      <param name="build.main.javac" value="${javac11}"/>
613 >      <param name="build.main.javadoc" value="${javadoc15}"/>
614 >      <param name="build.main.javadoc.source" value="11"/>
615 >      <target name="clean"/>
616 >      <target name="test"/>
617 >      <target name="docs"/>
618 >    </antcall>
619    </target>
620  
621  
622 <  <target name="jsr166ydist"
623 <          depends="jsr166ydist-jar, jsr166ydist-docs"
624 <          description="Puts all distributable products in single hierarchy"/>
625 <
943 <
944 <  <target name="jsr166yclean"
945 <          description="Removes all jsr166y build products">
946 <
947 <    <delete dir="${build.jsr166y.dir}"/>
622 >  <target name="configure-compiler">
623 >    <fail message="ant version too old">
624 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
625 >    </fail>
626  
627 <  </target>
627 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
628  
629 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
630 +      <istrue value="${build.warnunchecked}"/>
631 +    </condition>
632  
633 <  <target name="jsr166ydist-clean"
953 <          description="Removes all build and distribution products">
633 >    <property name="warnunchecked.arg" value=""/>
634  
955  </target>
635  
636 <  <target name="jsr166ydist-jar"
637 <          depends="jsr166yclean, jsr166yjar">
959 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
960 <  </target>
636 >    <!-- Common options in javac invocations -->
637 >    <property name="build.args" value="${warnunchecked.arg}"/>
638  
962  <target name="jsr166ydist-docs"
963          depends="jsr166yclean, jsr166ydocs">
964    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
639    </target>
640  
641  
642 <  <!-- extra166y -->
643 <
642 >  <target name="compile-test-loops" depends="jar"
643 >          description="Compiles all the perf tests in src/test/loops">
644  
645 <  <target name="extra166ycompile"
972 <          depends="configure-compiler, jsr166yjar"
973 <          description="Compiles extra166y sources">
645 >    <mkdir dir="${build.dir}/test/loops"/>
646  
647 <    <mkdir dir="${build.extra166y.classes.dir}"/>
648 <
977 <    <javac srcdir="${topsrc.dir}"
978 <           destdir="${build.extra166y.classes.dir}"
647 >    <javac srcdir="${basedir}/src/test/loops"
648 >           destdir="${build.dir}/test/loops"
649             debug="${build.debug}"
650             debuglevel="${build.debuglevel}"
651             deprecation="${build.deprecation}"
982           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
983           classpath=""
984           source="6"
652             includeAntRuntime="false"
653             includeJavaRuntime="false"
654 <           executable="${javac7}"
654 >           encoding="ASCII"
655 >           executable="${build.main.javac}"
656             fork="true">
657  
658 <      <include name="extra166y/**/*.java"/>
658 >      <include name="*.java"/>
659        <compilerarg value="-XDignore.symbol.file=true"/>
660 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
660 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
661 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
662        <compilerarg line="${build.args}"/>
994
663      </javac>
664    </target>
665  
666  
667 <  <target name="extra166yjar"
668 <          depends="extra166ycompile"
669 <          description="Builds library jar from compiled sources">
670 <
671 <    <jar destfile="${extra166y.jar}" index="true">
672 <      <fileset dir="${build.extra166y.classes.dir}"/>
673 <    </jar>
1006 <
1007 <  </target>
1008 <
1009 <
1010 <  <target name="extra166ydocs"
1011 <          description="Builds javadocs to build dir">
667 >  <!-- old branches no longer maintained.  build support deleted -->
668 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
669 >  <!-- jsr166 4jdk7 (no longer maintained) -->
670 >  <!-- jsr166x (no longer maintained) -->
671 >  <!-- jsr166y (no longer maintained) -->
672 >  <!-- extra166y (no longer maintained) -->
673 >  <!-- jsr166e (no longer maintained) -->
674  
675 <    <delete dir="${extra166ydocs.dir}"/>
1014 <    <mkdir dir="${extra166ydocs.dir}"/>
1015 <
1016 <    <javadoc destdir="${extra166ydocs.dir}"
1017 <             packagenames="extra166y.*"
1018 <             link="${jdkapidocs.url}"
1019 <             access="${build.javadoc.access}"
1020 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021 <             bootclasspath="${bootclasspath6}"
1022 <             source="6"
1023 <             executable="${javadoc7}">
1024 <      <arg value="-XDignore.symbol.file=true"/>
1025 <
1026 <    </javadoc>
1027 <  </target>
1028 <
1029 <
1030 <  <target name="extra166ydist"
1031 <          depends="extra166ydist-jar, extra166ydist-docs"
1032 <          description="Puts all distributable products in single hierarchy"/>
1033 <
1034 <
1035 <  <target name="extra166yclean"
1036 <          description="Removes all extra166y build products">
1037 <
1038 <    <delete dir="${build.extra166y.dir}"/>
1039 <
1040 <  </target>
1041 <
1042 <
1043 <  <target name="extra166ydist-clean"
1044 <          description="Removes all build and distribution products">
1045 <
1046 <  </target>
1047 <
1048 <  <target name="extra166ydist-jar"
1049 <          depends="extra166yclean, extra166yjar">
1050 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1051 <  </target>
675 > <!-- Find buglets that can be detected by static build tools -->
676  
677 <  <target name="extra166ydist-docs"
678 <          depends="extra166yclean, extra166ydocs">
679 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
677 > <!--   <target name="lint"> -->
678 > <!--     <antcall target="dists"> -->
679 > <!--       <param name="build.javadoc.access" value="protected"/> -->
680 > <!--     </antcall> -->
681 > <!--   </target> -->
682 >
683 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
684 >  <target name="doclint-private">
685 >    <antcall target="dist">
686 >      <param name="build.javadoc.access" value="private"/>
687 >    </antcall>
688    </target>
689  
1058  <!-- jsr166e -->
1059
1060  <target name="jsr166ecompile"
1061          depends="configure-compiler"
1062          description="Compiles jsr166e sources">
690  
691 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
691 > <!-- ==============================================================
692 >  Experimental errorprone support
693 >  https://errorprone.info
694 >  https://errorprone.info/docs/installation
695 >  https://github.com/google/error-prone/issues/1143
696 > =================================================================== -->
697 >  <path id="errorprone.processorpath.path">
698 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
699 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
700 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
701 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
702 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
703 >  </path>
704 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
705 >  <property name="errorprone.jsr166.user.flags" value=""/>
706 >  <property name="errorprone.jsr166.flags"
707 >            value="-Xep:HashtableContains:OFF
708 >                   -Xep:JdkObsolete:OFF
709 >                   -Xep:MissingOverride:OFF
710 >                   -Xep:MissingFail:OFF
711 >                   -Xep:ThreadPriorityCheck:OFF
712 >                   -Xep:MixedArrayDimensions:ERROR
713 >                   -Xep:RemoveUnusedImports:ERROR
714 >                   -Xep:EmptyIf:ERROR
715 >                   -Xep:MultipleTopLevelClasses:ERROR
716 >                   -Xep:ClassName:ERROR
717 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
718 >                   -Xep:RedundantThrows:ERROR
719 >                   -Xep:IdentityBinaryExpression:WARN
720 >                   -Xep:ConstructorInvokesOverridable:WARN
721 >                   -Xep:MethodCanBeStatic:WARN
722 >                   ${errorprone.jsr166.user.flags}"/>
723 >  <!-- -Xep:WildcardImport:ERROR -->
724 >  <property name="errorprone.jsr166.test.flags"
725 >            value="-Xep:StringSplitter:OFF
726 >                   -Xep:BoxedPrimitiveConstructor:OFF
727 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
728 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
729 >  <target name="errorprone"
730 >          depends="clean, configure-compiler"
731 >          description="Run errorprone over jsr166 source code (experimental)">
732 >
733 >    <local name="destdir"/>
734 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
735 >    <mkdir dir="${destdir}"/>
736  
737 <    <javac srcdir="${topsrc.dir}"
738 <           destdir="${build.jsr166e.classes.dir}"
737 >    <javac srcdir="${src.dir}"
738 >           destdir="${destdir}"
739             debug="${build.debug}"
740             debuglevel="${build.debuglevel}"
741             deprecation="${build.deprecation}"
1071           source="7"
742             classpath=""
743             includeAntRuntime="false"
744             includeJavaRuntime="false"
745 <           executable="${javac7}"
745 >           encoding="ASCII"
746 >           executable="${build.main.javac}"
747             fork="true">
748  
749 <      <include name="jsr166e/**/*.java"/>
749 >      <include name="**/*.java"/>
750 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
751 >      <compilerarg value="-J--illegal-access=permit"/>
752 >      <compilerarg value="-XDcompilePolicy=simple"/>
753 >      <compilerarg value="-processorpath"/>
754 >      <compilerarg pathref="errorprone.processorpath.path"/>
755 >      <compilerarg value="-Xplugin:ErrorProne
756 >                          ${errorprone.jsr166.flags}"/>
757 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
758 >      <compilerarg value="-Xprefer:source"/>
759        <compilerarg value="-XDignore.symbol.file=true"/>
760        <compilerarg value="-Xlint:all"/>
761 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
762 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
763        <compilerarg line="${build.args}"/>
1082
764      </javac>
1084  </target>
1085
765  
766 <  <target name="jsr166ejar"
767 <          depends="jsr166ecompile"
1089 <          description="Builds library jar from compiled sources">
1090 <
1091 <    <jar destfile="${jsr166e.jar}" index="true">
1092 <      <fileset dir="${build.jsr166e.classes.dir}"/>
766 >    <jar destfile="${product.jar}">
767 >      <fileset dir="${destdir}"/>
768      </jar>
769  
1095  </target>
1096
1097
1098  <target name="jsr166edocs"
1099          description="Builds javadocs to build dir">
1100
1101    <delete dir="${jsr166edocs.dir}"/>
1102    <mkdir dir="${jsr166edocs.dir}"/>
1103
1104    <javadoc destdir="${jsr166edocs.dir}"
1105             packagenames="jsr166e.*"
1106             link="${jdkapidocs.url}"
1107             access="${build.javadoc.access}"
1108             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1109             source="7"
1110             executable="${javadoc7}">
1111      <arg value="-XDignore.symbol.file=true"/>
1112
1113    </javadoc>
1114  </target>
1115
1116
1117  <target name="jsr166e-test-tck"
1118          depends="jsr166ejar"
1119          description="Runs tck tests for jsr166e">
1120
770      <run-tck-tests
771 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
772 <      target="7"
773 <      workdir="${build.jsr166e.dir}"
774 <      classes="${jsr166e.jar}"/>
775 <  </target>
776 <
777 <
778 <  <target name="jsr166edist"
779 <          depends="jsr166edist-jar, jsr166edist-docs"
780 <          description="Puts all distributable products in single hierarchy"/>
781 <
782 <
783 <  <target name="jsr166eclean"
784 <          description="Removes all jsr166e build products">
1136 <    <delete dir="${build.jsr166e.dir}"/>
1137 <  </target>
1138 <
1139 <
1140 <  <target name="jsr166edist-clean"
1141 <          description="Removes all build and distribution products">
1142 <
1143 <  </target>
1144 <
1145 <  <target name="jsr166edist-jar"
1146 <          depends="jsr166eclean, jsr166ejar">
1147 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1148 <  </target>
1149 <
1150 <  <target name="jsr166edist-docs"
1151 <          depends="jsr166eclean, jsr166edocs">
1152 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
771 >      target="${java.runtime.target}"
772 >      workdir="${build.dir}"
773 >      classes="${product.jar}">
774 >      <javac-elements>
775 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
776 >        <compilerarg value="-J--illegal-access=permit"/>
777 >        <compilerarg value="-XDcompilePolicy=simple"/>
778 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
779 >        <compilerarg value="-Xplugin:ErrorProne
780 >                            ${errorprone.jsr166.flags}
781 >                            ${errorprone.jsr166.test.flags}"/>
782 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
783 >      </javac-elements>
784 >    </run-tck-tests>
785    </target>
786  
787 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
788 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
789 +  <target name="errorprone-jtreg"
790 +          depends="jar"
791 +          description="Run errorprone over jtreg tests (experimental)">
792  
793 < <!-- Find buglets that can be detected by static build tools -->
793 >    <run-jtreg-tests
794 >       target="${java.runtime.target}"
795 >       workdir="${build.dir}"
796 >       classes="${product.jar}"
797 >       verbose="all">
798 >      <jtreg-elements>
799 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
800 >        <arg value="-javacoption:-processorpath"/>
801 >        <arg value="-javacoption:${errorprone.processorpath}"/>
802 >        <arg value="-javacoption:-Xplugin:ErrorProne
803 >                            ${errorprone.jsr166.flags}
804 >                            ${errorprone.jsr166.test.flags}
805 >                            -Xep:MultipleTopLevelClasses:WARN
806 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
807 >      </jtreg-elements>
808 >    </run-jtreg-tests>
809 >  </target>
810 >
811 >
812 > <!-- ==============================================================
813 >  Running guava tests against jsr166 code
814 > =================================================================== -->
815 >
816 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
817 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
818 > <!-- <property name="guava.version" value="21.0"/> -->
819 >
820 > <!-- HOWTO debug print a path id -->
821 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
822 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
823 >
824 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
825 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
826 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
827 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
828 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
829 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
830 >
831 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
832 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
833 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
834 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
835 >
836 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
837 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
838 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
839 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
840 >
841 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
842 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
843 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
844 >
845 >  <target name="init-ivy">
846 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
847 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
848 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
849 >             classpath="${build.dir}/ivy.jar"/>
850 >  </target>
851 >
852 >  <target name="guava-tests" depends="jar, init-ivy"
853 >          description="Guava tests run against jsr166 collections">
854 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
855 >    <mkdir dir="${guava.dir}"/>
856 >    <ivy:retrieve pathid="guava.testlib.classpath"
857 >      type="jar,bundle" inline="true" conf="default,master"
858 >      pattern="${guava.dir}/[artifact].[ext]"
859 >      organisation="com.google.guava" module="guava-testlib"/>
860 >    <property name="guava.version" value="21.0"/>
861 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
862 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
863 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
864 >           jvm="${build.main.java}" fork="true">
865 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
866 >      <formatter type="brief"/>
867 >      <classpath>
868 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
869 >        <path refid="guava.testlib.classpath"/>
870 >      </classpath>
871  
872 <  <target name="lint">
873 <    <antcall target="dists">
874 <      <param name="build.javadoc.access" value="private"/>
1161 <    </antcall>
872 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
873 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
874 >    </junit>
875    </target>
876  
1164
877   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines