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.157 by jsr166, Tue Jul 8 00:01:39 2014 UTC vs.
Revision 1.315 by jsr166, Fri Jun 5 00:59:33 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   Profiling a tck test class:
51   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52   Stress test a tck test class:
53   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54  -->
55  <property name="jsr166.profileTests"     value="false"/>
56  <property name="jsr166.profileThreshold" value="100"/>
57  <property name="jsr166.runsPerTest"      value="1"/>
58  <!-- Stress test an individual tck test class:
59  ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60  -->
61  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62
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"/>
68  <property name="build.reports.dir"           location="${build.dir}/reports"/>
69
70  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
72  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
73  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
74
75  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79
80  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83  <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 88 | 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"/>
97 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
98 <    <path id="bootclasspath@{v}">
99 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
100 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
101 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
102 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
103 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
104 <    </path>
105 <    <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 118 | 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"/>
135  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
136  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
137  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
138  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
139  <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"/>
144 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
145 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
146 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
147 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
148 <
149 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
150 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
151 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
152 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
153 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
154 <  <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"/>
158  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
159  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
160  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
161  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
162  <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 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
131 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
132 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
133 <  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
134 <  <!-- Default jdk doc location (latest stable release seems best) -->
135 <  <property name="java.docroot.url"       value="${java8.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 186 | 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="-ea -esa -Djsr166.testImplementationDetails=true"/>
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 212 | Line 187
187             source="@{compile-target}"
188             target="@{compile-target}"
189             classpath="${junit.jar}"
215           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 230 | 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 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
249 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
250 <    <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"/>
258 <    <mkdir dir="@{workdir}/JTwork/scratch"/>
259 <    <mkdir dir="@{workdir}/JTreport"/>
260 <    <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 279 | 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"/>
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 for private elements, due to -->
356 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
357 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
358 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
359        <compilerarg value="-Xdoclint:all/protected"/>
360 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
361 +      <compilerarg value="-Werror"/>
362        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363        <compilerarg line="${build.args}"/>
364  
# Line 322 | Line 368
368  
369    <target name="jar"
370            depends="compile"
371 <          description="Builds library jar from compiled sources">
372 <
371 >          description="Builds library jar for src/main from compiled sources">
372 >    <local name="subdir"/>
373 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
374      <jar destfile="${product.jar}">
375 <      <fileset dir="${build.classes.dir}"/>
375 >      <fileset dir="${build.classes.dir}${subdir}"/>
376 >      <manifest>
377 >        <attribute name="Built-By" value="${user.name}"/>
378 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
379 >      </manifest>
380      </jar>
381    </target>
382  
# Line 333 | Line 384
384    <target name="docs"
385            description="Builds javadocs for src/main to dist dir">
386  
387 <    <delete dir="${docs.dir}"/>
387 >    <delete dir="${docs.dir}" quiet="true"/>
388      <mkdir dir="${docs.dir}"/>
389  
390 +    <!-- old school frames via docs/index.html?overview-summary.html -->
391 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
392 +    <local name="use-frames"/>
393 +    <condition property="use-frames">
394 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
395 +    </condition>
396 +
397      <!-- the packagenames="none" hack below prevents scanning the -->
398      <!-- sourcepath for packages -->
399  
400 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
401 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
402 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
403 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
404 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
405      <javadoc destdir="${docs.dir}"
406               packagenames="none"
407 <             link="${java9.api.url}"
407 >             link="${java.api.url}"
408               overview="${src.dir}/intro.html"
409               access="${build.javadoc.access}"
410 <             sourcepath="${src.dir}:${jdk9src.dir}"
410 >             sourcepath="${src.dir}"
411               classpath=""
412 <             executable="${javadoc9}">
412 >             source="${build.main.javadoc.source}"
413 >             executable="${build.main.javadoc}">
414 > <!-- TODO: JDK-8214571 failonerror = "true" -->
415        <fileset dir="${src.dir}" defaultexcludes="yes">
416 <        <include name="**/*.java"/>
416 >        <include name="java/**/*.java"/>
417        </fileset>
418 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
418 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
419        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
420 +      <arg value="-quiet"/>
421        <arg value="-XDignore.symbol.file=true"/>
422 <      <arg value="-tag"/>
423 <      <arg value="${javadoc.jls.option}"/>
424 <      <arg value="-tag"/>
425 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
426 <      <arg value="-tag"/>
427 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
428 <      <arg value="-tag"/>
429 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
422 >      <arg value="-html5"/>
423 >      <arg value="--patch-module=java.base=${src.dir}"/>
424 >      <arg value="--frames" if:set="use-frames"/>
425 >      <arg value="--override-methods=summary"/>
426 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
427 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
428 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
429 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
430 > <!-- tags added in jdk9: currently unused -->
431 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
433      </javadoc>
434    </target>
435  
# Line 370 | Line 439
439            description="Puts all distributable products in single hierarchy"/>
440  
441  
373  <target name="release"
374          depends="dist"
375          description="Puts entire CVS tree, plus distribution productions, in a jar">
376
377    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
378
379    <jar basedir="${basedir}" destfile="${release.jar}">
380      <!-- <exclude name="build/**"/> -->
381      <exclude name="${release.jar}"/>
382      <exclude name="user.properties"/>
383      <exclude name="etc/notes/**"/>
384      <exclude name="src/emulation/**"/>
385      <exclude name="**/SyntaxTest.java"/>
386      <exclude name="**/SuperfluousAbstract.java"/>
387    </jar>
388  </target>
389
390
442    <target name="clean"
443            description="Removes all build products">
393
444      <delete dir="${build.dir}"/>
395
445    </target>
446  
447  
448    <target name="dist-clean"
449            description="Removes all build and distribution products">
401
450      <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
404
452    </target>
453  
454  
# Line 415 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 <
466 <  <target name="test-tck"
467 <          depends="jar"
421 <          description="Runs tck tests for main directly">
465 >  <target name="tck"
466 >          depends="jar"
467 >          description="Runs tck tests for src/main directly">
468  
469      <run-tck-tests
470 <      target="${build.main.java.version}"
470 >      target="${java.runtime.target}"
471        workdir="${build.dir}"
472 <      classes="${product.jar}"/>
427 <  </target>
428 <
429 <  <target name="test-jtreg"
430 <          depends="jar"
431 <          description="Runs jtreg tests for main using the jtreg ant task">
432 <    <run-jtreg-tests
433 <       target="${build.main.java.version}"
434 <       workdir="${build.dir}"
435 <       classes="${product.jar}"/>
436 <  </target>
437 <
438 <  <target name="test"
439 <          depends="test-tck, test-jtreg"
440 <          description="Runs tck and jtreg tests for main">
441 <  </target>
442 <
443 <  <target name="test89"
444 <          description="Runs tck and jtreg tests for main for multiple java versions">
445 <
446 <    <antcall target="clean"/>
447 <    <antcall target="test">
448 <      <param name="build.main.java.version" value="8"/>
449 <      <param name="build.main.javac" value="${javac8}"/>
450 <    </antcall>
451 <
452 <    <antcall target="clean"/>
453 <    <antcall target="test">
454 <      <param name="build.main.java.version" value="9"/>
455 <      <param name="build.main.javac" value="${javac9}"/>
456 <    </antcall>
457 <
458 <  </target>
459 <
460 <
461 <
462 <  <target name="configure-compiler">
463 <
464 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
465 <
466 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
467 <      <istrue value="${build.warnunchecked}"/>
468 <    </condition>
469 <
470 <    <property name="warnunchecked.arg" value=""/>
471 <
472 <
473 <    <!-- Common options in javac invocations -->
474 <    <property name="build.args" value="${warnunchecked.arg}"/>
475 <
476 <  </target>
477 <
478 <
479 <
480 <  <!-- Various demos and test programs -->
481 <
482 <
483 <  <target name="loops" depends="configure-compiler"
484 <          description="Benchmark from Doug Lea's AQS paper">
485 <
486 <    <mkdir dir="${build.loops.dir}"/>
487 <
488 <    <javac srcdir="${loops.src.dir}"
489 <          destdir="${build.loops.dir}"
490 <            debug="${build.debug}"
491 <       debuglevel="${build.debuglevel}"
492 <      deprecation="${build.deprecation}"
493 <           source="${build.sourcelevel}"
494 <             fork="true">
495 <
496 <      <compilerarg line="${build.args}"/>
497 <      <classpath refid="loops.classpath"/>
498 <      <compilerarg value="-XDignore.symbol.file=true"/>
499 <
500 <    </javac>
501 <
502 <    <java classname="ALoops" fork="true">
503 <      <classpath refid="loops.classpath"/>
504 <    </java>
505 <
506 <  </target>
507 <
508 <
509 <  <!-- jsr166 4jdk7 -->
510 <
511 <  <target name="4jdk7compile"
512 <          depends="configure-compiler"
513 <          description="Compiles src/jdk7 sources, targeting jdk7">
514 <
515 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
516 <
517 <    <javac srcdir="${4jdk7src.dir}"
518 <           destdir="${build.4jdk7.classes.dir}"
519 <           debug="${build.debug}"
520 <           debuglevel="${build.debuglevel}"
521 <           deprecation="${build.deprecation}"
522 <           source="6"
523 <           classpath=""
524 <           bootclasspath="${bootclasspath6}"
525 <           includeAntRuntime="false"
526 <           includeJavaRuntime="false"
527 <           executable="${javac7}"
528 <           fork="true">
529 <
530 <      <include name="**/*.java"/>
531 <      <compilerarg value="-Xprefer:source"/>
532 <      <compilerarg value="-XDignore.symbol.file=true"/>
533 <      <compilerarg value="-Xlint:all"/>
534 <      <compilerarg line="${build.args}"/>
535 <
536 <    </javac>
537 <  </target>
538 <
539 <  <target name="4jdk7doclint"
540 <          depends="configure-compiler"
541 <          description="Finds doclint warnings">
542 <
543 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
544 <
545 <    <javac srcdir="${4jdk7src.dir}"
546 <           destdir="${build.4jdk7.classes.dir}"
547 <           debug="${build.debug}"
548 <           debuglevel="${build.debuglevel}"
549 <           deprecation="${build.deprecation}"
550 <           source="6"
551 <           classpath=""
552 <           bootclasspath="${bootclasspath7}"
553 <           includeAntRuntime="false"
554 <           includeJavaRuntime="false"
555 <           executable="${javac8}"
556 <           fork="true">
557 <
558 <      <include name="**/*.java"/>
559 <      <compilerarg value="-Xprefer:source"/>
560 <      <compilerarg value="-XDignore.symbol.file=true"/>
561 <      <compilerarg value="-Xlint:all"/>
562 <      <compilerarg value="-Xdoclint:all/protected"/>
563 <      <compilerarg line="${build.args}"/>
564 <
565 <    </javac>
566 <  </target>
567 <
568 <
569 <  <target name="4jdk7jar"
570 <          depends="4jdk7compile"
571 <          description="Builds library jar from compiled sources">
572 <
573 <    <jar destfile="${4jdk7product.jar}">
574 <      <fileset dir="${build.4jdk7.classes.dir}"/>
575 <    </jar>
576 <
577 <  </target>
578 <
579 <
580 <  <target name="4jdk7-test-tck"
581 <          depends="4jdk7jar"
582 <          description="Runs tck tests for jsr166-4jdk7 directly">
583 <
584 <    <run-tck-tests
585 <      target="7"
586 <      workdir="${build.4jdk7.dir}"
587 <      classes="${4jdk7product.jar}">
472 >      classes="${product.jar}">
473        <javac-elements>
474 <        <!-- JDK8+ test classes -->
590 <        <exclude name="*8Test.java"/>
591 <        <exclude name="*9Test.java"/>
592 <        <exclude name="DoubleAccumulatorTest.java"/>
593 <        <exclude name="DoubleAdderTest.java"/>
594 <        <exclude name="LongAccumulatorTest.java"/>
595 <        <exclude name="LongAdderTest.java"/>
596 <        <exclude name="CompletableFutureTest.java"/>
597 <        <exclude name="SplittableRandomTest.java"/>
598 <        <exclude name="StampedLockTest.java"/>
474 >        <compilerarg value="-Werror"/>
475        </javac-elements>
476      </run-tck-tests>
477    </target>
478  
479 <
480 <  <target name="4jdk7-test-tck-junit"
481 <          depends="4jdk7compile"
482 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
483 <
608 <    <junit printsummary="true"
609 <           showoutput="true"
610 <           errorProperty="junit.failed"
611 <           failureProperty="junit.failed"
612 <           includeantruntime="true"
613 <           jvm="${java7}"
614 <           fork="true">
615 <
616 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
617 <      <jvmarg value="-server"/>
618 <
619 <      <classpath>
620 <        <pathelement location="${junit.jar}"/>
621 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
622 <      </classpath>
623 <
624 <      <formatter type="brief"/>
625 <
626 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
627 <      </test>
628 <
629 <    </junit>
630 <  </target>
631 <
632 <  <target name="4jdk7-test-jtreg"
633 <          depends="4jdk7jar"
634 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
635 <    <run-jtreg-tests
636 <       target="7"
637 <       workdir="${build.4jdk7.dir}"
638 <       classes="${4jdk7product.jar}"
639 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
640 <  </target>
641 <
642 <
643 <  <target name="4jdk7-test"
644 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
645 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
646 <  </target>
647 <
648 <
649 <  <target name="4jdk7docs"
650 <          description="Builds javadocs for src/jdk7 to dist dir">
651 <
652 <    <delete dir="${4jdk7docs.dir}"/>
653 <    <mkdir dir="${4jdk7docs.dir}"/>
654 <
655 <    <javadoc destdir="${4jdk7docs.dir}"
656 <             packagenames="none"
657 <             link="${java7.api.url}"
658 <             overview="${4jdk7src.dir}/intro.html"
659 <             access="${build.javadoc.access}"
660 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
661 <             classpath=""
662 <             executable="${javadoc7}">
663 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
664 <        <include name="**/*.java"/>
665 <      </fileset>
666 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
667 <      <arg value="-XDignore.symbol.file=true"/>
668 <    </javadoc>
479 >  <target name="tck-parallelism-1"
480 >          description="Runs tck with common pool parallelism 1">
481 >    <antcall target="tck">
482 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
483 >    </antcall>
484    </target>
485  
486 <
487 <  <target name="4jdk7dist"
488 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
489 <          description="Puts all distributable products in single hierarchy"/>
490 <
676 <
677 <  <target name="4jdk7clean"
678 <          description="Removes all 4jdk7 build products">
679 <
680 <    <delete dir="${build.4jdk7.dir}"/>
681 <
486 >  <target name="tck-parallelism-0"
487 >          description="Runs tck with common pool parallelism 0">
488 >    <antcall target="tck">
489 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
490 >    </antcall>
491    </target>
492  
493 <
494 <  <target name="4jdk7dist-jar"
495 <          depends="4jdk7clean, 4jdk7jar">
496 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
493 >  <target name="tck-security-manager"
494 >          description="Runs tck with a security manager">
495 >    <antcall target="tck">
496 >      <param name="jsr166.useSecurityManager" value="true"/>
497 >    </antcall>
498    </target>
499  
500 <
501 <  <target name="4jdk7dist-docs"
502 <          depends="4jdk7clean, 4jdk7docs">
503 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
500 >  <target name="jtreg"
501 >          depends="jar"
502 >          description="Runs jtreg tests for src/main using the jtreg ant task">
503 >    <run-jtreg-tests
504 >       target="${java.runtime.target}"
505 >       workdir="${build.dir}"
506 >       classes="${product.jar}"/>
507    </target>
508  
509 +  <target name="test"
510 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
511 +          description="Runs tck and jtreg tests for src/main"/>
512  
513 <  <!-- jsr166x -->
514 <
515 <  <target name="jsr166xcompile"
516 <          depends="configure-compiler"
517 <          description="Compiles jsr166x sources to build dir">
518 <
519 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
520 <
521 <    <javac srcdir="${topsrc.dir}"
522 <           destdir="${build.jsr166x.classes.dir}"
523 <           debug="${build.debug}"
524 <           debuglevel="${build.debuglevel}"
525 <           deprecation="${build.deprecation}"
526 <           classpath=""
711 <           bootclasspath="${bootclasspath6}"
712 <           source="5"
713 <           includeAntRuntime="false"
714 <           includeJavaRuntime="false"
715 <           executable="${javac7}"
716 <           fork="true">
717 <
718 <      <include name="jsr166x/**/*.java"/>
719 <      <compilerarg value="-XDignore.symbol.file=true"/>
720 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
721 <      <compilerarg line="${build.args}"/>
722 <
723 <    </javac>
513 >  <target name="test-version-permutations"
514 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
515 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
516 >
517 >  <target name="test11">
518 >    <antcall>
519 >      <param name="java.runtime.target" value="11"/>
520 >      <param name="build.main.javac" value="${javac11}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="11"/>
523 >      <target name="clean"/>
524 >      <target name="test"/>
525 >      <target name="docs"/>
526 >    </antcall>
527    </target>
528  
529 <
530 <  <target name="jsr166xjar"
531 <          depends="jsr166xcompile"
532 <          description="Builds library jar from compiled sources">
533 <
534 <    <jar destfile="${jsr166x.jar}">
535 <      <fileset dir="${build.jsr166x.classes.dir}"/>
536 <    </jar>
537 <
529 >  <target name="test12">
530 >    <antcall>
531 >      <param name="java.runtime.target" value="12"/>
532 >      <param name="build.main.javac" value="${javac12}"/>
533 >      <param name="build.main.javadoc" value="${javadoc12}"/>
534 >      <param name="build.main.javadoc.source" value="12"/>
535 >      <target name="clean"/>
536 >      <target name="test"/>
537 >      <target name="docs"/>
538 >    </antcall>
539    </target>
540  
541 <
542 <  <target name="jsr166xdocs"
543 <          description="Builds javadocs to dist dir">
544 <
545 <    <delete dir="${jsr166xdocs.dir}"/>
546 <    <mkdir dir="${jsr166xdocs.dir}"/>
547 <
548 <    <javadoc destdir="${jsr166xdocs.dir}"
549 <             packagenames="jsr166x.*"
550 <             link="${java.api.url}"
747 <             access="${build.javadoc.access}"
748 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
749 <             bootclasspath="${bootclasspath6}"
750 <             source="5"
751 <             executable="${javadoc7}">
752 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
753 <      <arg value="-XDignore.symbol.file=true"/>
754 <
755 <    </javadoc>
541 >  <target name="test13">
542 >    <antcall>
543 >      <param name="java.runtime.target" value="13"/>
544 >      <param name="build.main.javac" value="${javac13}"/>
545 >      <param name="build.main.javadoc" value="${javadoc13}"/>
546 >      <param name="build.main.javadoc.source" value="13"/>
547 >      <target name="clean"/>
548 >      <target name="test"/>
549 >      <target name="docs"/>
550 >    </antcall>
551    </target>
552  
553 <
554 <  <target name="jsr166xdist"
555 <          depends="jsr166xdist-jar, jsr166xdist-docs"
556 <          description="Puts all distributable products in single hierarchy"/>
557 <
558 <
559 <  <target name="jsr166xclean"
560 <          description="Removes all jsr166x build products">
561 <
562 <    <delete dir="${build.jsr166x.dir}"/>
768 <
553 >  <target name="test14">
554 >    <antcall>
555 >      <param name="java.runtime.target" value="14"/>
556 >      <param name="build.main.javac" value="${javac14}"/>
557 >      <param name="build.main.javadoc" value="${javadoc14}"/>
558 >      <param name="build.main.javadoc.source" value="14"/>
559 >      <target name="clean"/>
560 >      <target name="test"/>
561 >      <target name="docs"/>
562 >    </antcall>
563    </target>
564  
565 <
566 <  <target name="jsr166xdist-jar"
567 <          depends="jsr166xclean, jsr166xjar">
568 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
565 >  <target name="test15">
566 >    <antcall>
567 >      <param name="java.runtime.target" value="15"/>
568 >      <param name="build.main.javac" value="${javac15}"/>
569 >      <param name="build.main.javadoc" value="${javadoc15}"/>
570 >      <param name="build.main.javadoc.source" value="15"/>
571 >      <target name="clean"/>
572 >      <target name="test"/>
573 >      <target name="docs"/>
574 >    </antcall>
575    </target>
576  
577 <  <target name="jsr166xdist-docs"
578 <          depends="jsr166xclean, jsr166xdocs">
579 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
577 >  <target name="test11-12">
578 >    <antcall>
579 >      <param name="java.runtime.target" value="12"/>
580 >      <param name="build.main.javac" value="${javac11}"/>
581 >      <param name="build.main.javadoc" value="${javadoc12}"/>
582 >      <param name="build.main.javadoc.source" value="11"/>
583 >      <target name="clean"/>
584 >      <target name="test"/>
585 >      <target name="docs"/>
586 >    </antcall>
587    </target>
588  
589 <  <!-- jsr166y -->
590 <
591 <
592 <  <target name="jsr166ycompile"
593 <          depends="configure-compiler"
594 <          description="Compiles jsr166y sources">
595 <
596 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
597 <
598 <    <javac srcdir="${topsrc.dir}"
792 <           destdir="${build.jsr166y.classes.dir}"
793 <           debug="${build.debug}"
794 <           debuglevel="${build.debuglevel}"
795 <           deprecation="${build.deprecation}"
796 <           source="6"
797 <           classpath=""
798 <           bootclasspath="${bootclasspath6}"
799 <           includeAntRuntime="false"
800 <           includeJavaRuntime="false"
801 <           executable="${javac7}"
802 <           fork="true">
803 <
804 <      <include name="jsr166y/**/*.java"/>
805 <      <compilerarg value="-XDignore.symbol.file=true"/>
806 <      <compilerarg value="-Xlint:all"/>
807 <      <compilerarg line="${build.args}"/>
808 <
809 <    </javac>
589 >  <target name="test11-13">
590 >    <antcall>
591 >      <param name="java.runtime.target" value="13"/>
592 >      <param name="build.main.javac" value="${javac11}"/>
593 >      <param name="build.main.javadoc" value="${javadoc13}"/>
594 >      <param name="build.main.javadoc.source" value="11"/>
595 >      <target name="clean"/>
596 >      <target name="test"/>
597 >      <target name="docs"/>
598 >    </antcall>
599    </target>
600  
601 <
602 <  <target name="jsr166yjar"
603 <          depends="jsr166ycompile"
604 <          description="Builds library jar from compiled sources">
605 <
606 <    <jar destfile="${jsr166y.jar}" index="true">
607 <      <fileset dir="${build.jsr166y.classes.dir}"/>
608 <    </jar>
609 <
601 >  <target name="test11-14">
602 >    <antcall>
603 >      <param name="java.runtime.target" value="14"/>
604 >      <param name="build.main.javac" value="${javac11}"/>
605 >      <param name="build.main.javadoc" value="${javadoc14}"/>
606 >      <param name="build.main.javadoc.source" value="11"/>
607 >      <target name="clean"/>
608 >      <target name="test"/>
609 >      <target name="docs"/>
610 >    </antcall>
611    </target>
612  
613 <
614 <  <target name="jsr166ydocs"
615 <          description="Builds javadocs to dist dir">
616 <
617 <    <delete dir="${jsr166ydocs.dir}"/>
618 <    <mkdir dir="${jsr166ydocs.dir}"/>
619 <
620 <    <javadoc destdir="${jsr166ydocs.dir}"
621 <             packagenames="jsr166y.*"
622 <             link="${java.api.url}"
833 <             access="${build.javadoc.access}"
834 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
835 <             bootclasspath="${bootclasspath6}"
836 <             source="6"
837 <             executable="${javadoc7}">
838 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
839 <      <arg value="-XDignore.symbol.file=true"/>
840 <
841 <    </javadoc>
613 >  <target name="test11-15">
614 >    <antcall>
615 >      <param name="java.runtime.target" value="15"/>
616 >      <param name="build.main.javac" value="${javac11}"/>
617 >      <param name="build.main.javadoc" value="${javadoc15}"/>
618 >      <param name="build.main.javadoc.source" value="11"/>
619 >      <target name="clean"/>
620 >      <target name="test"/>
621 >      <target name="docs"/>
622 >    </antcall>
623    </target>
624  
625  
626 <  <target name="jsr166ydist"
627 <          depends="jsr166ydist-jar, jsr166ydist-docs"
628 <          description="Puts all distributable products in single hierarchy"/>
629 <
626 >  <target name="configure-compiler">
627 >    <fail message="ant version too old">
628 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629 >    </fail>
630  
631 <  <target name="jsr166yclean"
851 <          description="Removes all jsr166y build products">
631 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
632  
633 <    <delete dir="${build.jsr166y.dir}"/>
633 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
634 >      <istrue value="${build.warnunchecked}"/>
635 >    </condition>
636  
637 <  </target>
637 >    <property name="warnunchecked.arg" value=""/>
638  
639  
640 <  <target name="jsr166ydist-jar"
641 <          depends="jsr166yclean, jsr166yjar">
860 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
861 <  </target>
640 >    <!-- Common options in javac invocations -->
641 >    <property name="build.args" value="${warnunchecked.arg}"/>
642  
863  <target name="jsr166ydist-docs"
864          depends="jsr166yclean, jsr166ydocs">
865    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
643    </target>
644  
645  
646 <  <!-- extra166y -->
647 <
871 <
872 <  <target name="extra166ycompile"
873 <          depends="configure-compiler, jsr166yjar"
874 <          description="Compiles extra166y sources">
646 >  <target name="compile-test-loops" depends="jar"
647 >          description="Compiles all the perf tests in src/test/loops">
648  
649 <    <mkdir dir="${build.extra166y.classes.dir}"/>
649 >    <mkdir dir="${build.dir}/test/loops"/>
650  
651 <    <javac srcdir="${topsrc.dir}"
652 <           destdir="${build.extra166y.classes.dir}"
651 >    <javac srcdir="${basedir}/src/test/loops"
652 >           destdir="${build.dir}/test/loops"
653             debug="${build.debug}"
654             debuglevel="${build.debuglevel}"
655             deprecation="${build.deprecation}"
883           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
884           classpath=""
885           source="6"
656             includeAntRuntime="false"
657             includeJavaRuntime="false"
658 <           executable="${javac7}"
658 >           encoding="ASCII"
659 >           executable="${build.main.javac}"
660             fork="true">
661  
662 <      <include name="extra166y/**/*.java"/>
662 >      <include name="*.java"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>
664 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
664 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
666        <compilerarg line="${build.args}"/>
895
667      </javac>
668    </target>
669  
670  
671 <  <target name="extra166yjar"
672 <          depends="extra166ycompile"
673 <          description="Builds library jar from compiled sources">
674 <
675 <    <jar destfile="${extra166y.jar}" index="true">
676 <      <fileset dir="${build.extra166y.classes.dir}"/>
677 <    </jar>
907 <
908 <  </target>
909 <
910 <
911 <  <target name="extra166ydocs"
912 <          description="Builds javadocs to build dir">
913 <
914 <    <delete dir="${extra166ydocs.dir}"/>
915 <    <mkdir dir="${extra166ydocs.dir}"/>
916 <
917 <    <javadoc destdir="${extra166ydocs.dir}"
918 <             packagenames="extra166y.*"
919 <             link="${java.api.url}"
920 <             access="${build.javadoc.access}"
921 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
922 <             bootclasspath="${bootclasspath6}"
923 <             source="6"
924 <             executable="${javadoc7}">
925 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
926 <      <arg value="-XDignore.symbol.file=true"/>
927 <
928 <    </javadoc>
929 <  </target>
930 <
931 <
932 <  <target name="extra166ydist"
933 <          depends="extra166ydist-jar, extra166ydist-docs"
934 <          description="Puts all distributable products in single hierarchy"/>
935 <
936 <
937 <  <target name="extra166yclean"
938 <          description="Removes all extra166y build products">
939 <
940 <    <delete dir="${build.extra166y.dir}"/>
941 <
942 <  </target>
671 >  <!-- old branches no longer maintained.  build support deleted -->
672 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
673 >  <!-- jsr166 4jdk7 (no longer maintained) -->
674 >  <!-- jsr166x (no longer maintained) -->
675 >  <!-- jsr166y (no longer maintained) -->
676 >  <!-- extra166y (no longer maintained) -->
677 >  <!-- jsr166e (no longer maintained) -->
678  
679 + <!-- Find buglets that can be detected by static build tools -->
680  
681 <  <target name="extra166ydist-jar"
682 <          depends="extra166yclean, extra166yjar">
683 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
684 <  </target>
681 > <!--   <target name="lint"> -->
682 > <!--     <antcall target="dists"> -->
683 > <!--       <param name="build.javadoc.access" value="protected"/> -->
684 > <!--     </antcall> -->
685 > <!--   </target> -->
686  
687 <  <target name="extra166ydist-docs"
688 <          depends="extra166yclean, extra166ydocs">
689 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
687 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
688 >  <target name="doclint-private">
689 >    <antcall target="dist">
690 >      <param name="build.javadoc.access" value="private"/>
691 >    </antcall>
692    </target>
693  
955  <!-- jsr166e -->
956
957  <property name="build.jsr166e.java.version" value="6"/>
958  <property name="build.jsr166e.javac" value="${javac6}"/>
694  
695 <  <target name="jsr166ecompile"
696 <          depends="configure-compiler"
697 <          description="Compiles jsr166e sources">
698 <
699 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
695 > <!-- ==============================================================
696 >  Experimental errorprone support
697 >  https://errorprone.info
698 >  https://errorprone.info/docs/installation
699 >  https://github.com/google/error-prone/issues/1143
700 > =================================================================== -->
701 >  <path id="errorprone.processorpath.path">
702 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
703 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
704 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
705 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
706 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
707 >  </path>
708 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
709 >  <property name="errorprone.jsr166.user.flags" value=""/>
710 >  <property name="errorprone.jsr166.flags"
711 >            value="-Xep:HashtableContains:OFF
712 >                   -Xep:JdkObsolete:OFF
713 >                   -Xep:MissingOverride:OFF
714 >                   -Xep:MissingFail:OFF
715 >                   -Xep:ThreadPriorityCheck:OFF
716 >                   -Xep:MixedArrayDimensions:ERROR
717 >                   -Xep:RemoveUnusedImports:ERROR
718 >                   -Xep:EmptyIf:ERROR
719 >                   -Xep:MultipleTopLevelClasses:ERROR
720 >                   -Xep:ClassName:ERROR
721 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
722 >                   -Xep:RedundantThrows:ERROR
723 >                   -Xep:IdentityBinaryExpression:WARN
724 >                   -Xep:ConstructorInvokesOverridable:WARN
725 >                   -Xep:MethodCanBeStatic:WARN
726 >                   ${errorprone.jsr166.user.flags}"/>
727 >  <!-- -Xep:WildcardImport:ERROR -->
728 >  <property name="errorprone.jsr166.test.flags"
729 >            value="-Xep:StringSplitter:OFF
730 >                   -Xep:BoxedPrimitiveConstructor:OFF
731 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
732 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
733 >  <target name="errorprone"
734 >          depends="clean, configure-compiler"
735 >          description="Run errorprone over jsr166 source code (experimental)">
736 >
737 >    <local name="destdir"/>
738 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
739 >    <mkdir dir="${destdir}"/>
740  
741 <    <javac srcdir="${topsrc.dir}"
742 <           destdir="${build.jsr166e.classes.dir}"
741 >    <javac srcdir="${src.dir}"
742 >           destdir="${destdir}"
743             debug="${build.debug}"
744             debuglevel="${build.debuglevel}"
745             deprecation="${build.deprecation}"
971           source="${build.jsr166e.java.version}"
746             classpath=""
747             includeAntRuntime="false"
748             includeJavaRuntime="false"
749 <           executable="${build.jsr166e.javac}"
749 >           encoding="ASCII"
750 >           executable="${build.main.javac}"
751             fork="true">
752  
753 <      <include name="jsr166e/**/*.java"/>
753 >      <include name="**/*.java"/>
754 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
755 >      <compilerarg value="-J--illegal-access=permit"/>
756 >      <compilerarg value="-XDcompilePolicy=simple"/>
757 >      <compilerarg value="-processorpath"/>
758 >      <compilerarg pathref="errorprone.processorpath.path"/>
759 >      <compilerarg value="-Xplugin:ErrorProne
760 >                          ${errorprone.jsr166.flags}"/>
761 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
762 >      <compilerarg value="-Xprefer:source"/>
763        <compilerarg value="-XDignore.symbol.file=true"/>
764        <compilerarg value="-Xlint:all"/>
765 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
766 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
767        <compilerarg line="${build.args}"/>
982
983    </javac>
984  </target>
985
986  <!-- jsr166e: find doclint errors -->
987  <target name="jsr166edoclint">
988
989    <mkdir dir="${build.jsr166e.classes.dir}"/>
990
991    <javac srcdir="${topsrc.dir}"
992           destdir="${build.jsr166e.classes.dir}"
993           debug="${build.debug}"
994           debuglevel="${build.debuglevel}"
995           deprecation="${build.deprecation}"
996           source="${build.jsr166e.java.version}"
997           classpath=""
998           bootclasspath="${bootclasspath7}"
999           includeAntRuntime="false"
1000           includeJavaRuntime="false"
1001           executable="${javac8}"
1002           fork="true">
1003
1004      <include name="jsr166e/**/*.java"/>
1005      <compilerarg value="-XDignore.symbol.file=true"/>
1006      <compilerarg value="-Xlint:all"/>
1007      <compilerarg value="-Xdoclint:all/protected"/>
1008
768      </javac>
1010  </target>
1011
769  
770 <  <target name="jsr166ejar"
771 <          depends="jsr166ecompile"
1015 <          description="Builds library jar from compiled sources">
1016 <
1017 <    <jar destfile="${jsr166e.jar}" index="true">
1018 <      <fileset dir="${build.jsr166e.classes.dir}"/>
770 >    <jar destfile="${product.jar}">
771 >      <fileset dir="${destdir}"/>
772      </jar>
773  
1021  </target>
1022
1023
1024  <target name="jsr166edocs"
1025          description="Builds javadocs to build dir">
1026
1027    <delete dir="${jsr166edocs.dir}"/>
1028    <mkdir dir="${jsr166edocs.dir}"/>
1029
1030    <javadoc destdir="${jsr166edocs.dir}"
1031             packagenames="jsr166e.*"
1032             link="${java.api.url}"
1033             access="${build.javadoc.access}"
1034             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1035             source="${build.jsr166e.java.version}"
1036             executable="${javadoc7}">
1037      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1038      <arg value="-XDignore.symbol.file=true"/>
1039
1040    </javadoc>
1041  </target>
1042
1043
1044  <target name="jsr166e-test-tck-one-java-version"
1045          depends="jsr166ejar">
1046
1047    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1048
774      <run-tck-tests
775 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
776 <      target="${build.jsr166e.java.version}"
777 <      workdir="${build.jsr166e.dir}"
778 <      classes="${jsr166e.jar}"/>
779 <  </target>
780 <
781 <  <target name="jsr166e-test-tck"
782 <          description="Runs tck tests for jsr166e for multiple java versions">
783 <
784 < <!--     <antcall target="clean"/> -->
785 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
786 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
787 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
788 < <!--     </antcall> -->
1064 <
1065 <    <antcall target="clean"/>
1066 <    <antcall target="jsr166e-test-tck-one-java-version">
1067 <      <param name="build.jsr166e.java.version" value="7"/>
1068 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1069 <    </antcall>
1070 <
1071 <    <antcall target="clean"/>
1072 <    <antcall target="jsr166e-test-tck-one-java-version">
1073 <      <param name="build.jsr166e.java.version" value="6"/>
1074 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1075 <    </antcall>
1076 <  </target>
1077 <
1078 <
1079 <  <target name="jsr166e-test"
1080 <          depends="jsr166e-test-tck"
1081 <          description="Runs all tests for jsr166e">
1082 <  </target>
1083 <
1084 <  <target name="jsr166edist"
1085 <          depends="jsr166edist-jar, jsr166edist-docs"
1086 <          description="Puts all distributable products in single hierarchy"/>
1087 <
1088 <
1089 <  <target name="jsr166eclean"
1090 <          description="Removes all jsr166e build products">
1091 <    <delete dir="${build.jsr166e.dir}"/>
1092 <  </target>
1093 <
1094 <
1095 <  <target name="jsr166edist-jar"
1096 <          depends="jsr166eclean, jsr166ejar">
1097 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1098 <  </target>
1099 <
1100 <  <target name="jsr166edist-docs"
1101 <          depends="jsr166eclean, jsr166edocs">
1102 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
775 >      target="${java.runtime.target}"
776 >      workdir="${build.dir}"
777 >      classes="${product.jar}">
778 >      <javac-elements>
779 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
780 >        <compilerarg value="-J--illegal-access=permit"/>
781 >        <compilerarg value="-XDcompilePolicy=simple"/>
782 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
783 >        <compilerarg value="-Xplugin:ErrorProne
784 >                            ${errorprone.jsr166.flags}
785 >                            ${errorprone.jsr166.test.flags}"/>
786 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
787 >      </javac-elements>
788 >    </run-tck-tests>
789    </target>
790  
791 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
792 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
793 +  <target name="errorprone-jtreg"
794 +          depends="jar"
795 +          description="Run errorprone over jtreg tests (experimental)">
796  
797 < <!-- Find buglets that can be detected by static build tools -->
797 >    <run-jtreg-tests
798 >       target="${java.runtime.target}"
799 >       workdir="${build.dir}"
800 >       classes="${product.jar}"
801 >       verbose="all">
802 >      <jtreg-elements>
803 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
804 >        <arg value="-javacoption:-processorpath"/>
805 >        <arg value="-javacoption:${errorprone.processorpath}"/>
806 >        <arg value="-javacoption:-Xplugin:ErrorProne
807 >                            ${errorprone.jsr166.flags}
808 >                            ${errorprone.jsr166.test.flags}
809 >                            -Xep:MultipleTopLevelClasses:WARN
810 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
811 >      </jtreg-elements>
812 >    </run-jtreg-tests>
813 >  </target>
814 >
815 >
816 > <!-- ==============================================================
817 >  Running guava tests against jsr166 code
818 > =================================================================== -->
819 >
820 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
821 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
822 > <!-- <property name="guava.version" value="21.0"/> -->
823 >
824 > <!-- HOWTO debug print a path id -->
825 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
826 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
827 >
828 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
829 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
830 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
831 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
832 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
833 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
834 >
835 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
836 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
837 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
838 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
839 >
840 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
841 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
842 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
843 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
844 >
845 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
846 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
847 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
848 >
849 >  <target name="init-ivy">
850 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
851 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
852 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
853 >             classpath="${build.dir}/ivy.jar"/>
854 >  </target>
855 >
856 >  <target name="guava-tests" depends="jar, init-ivy"
857 >          description="Guava tests run against jsr166 collections">
858 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
859 >    <mkdir dir="${guava.dir}"/>
860 >    <ivy:retrieve pathid="guava.testlib.classpath"
861 >      type="jar,bundle" inline="true" conf="default,master"
862 >      pattern="${guava.dir}/[artifact].[ext]"
863 >      organisation="com.google.guava" module="guava-testlib"/>
864 >    <property name="guava.version" value="21.0"/>
865 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
866 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
867 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
868 >           jvm="${build.main.java}" fork="true">
869 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
870 >      <formatter type="brief"/>
871 >      <classpath>
872 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
873 >        <path refid="guava.testlib.classpath"/>
874 >      </classpath>
875  
876 <  <target name="lint">
877 <    <antcall target="dists">
878 <      <param name="build.javadoc.access" value="private"/>
1111 <    </antcall>
876 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
877 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
878 >    </junit>
879    </target>
880  
1114
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines