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.119 by jsr166, Mon Jan 21 02:31:40 2013 UTC vs.
Revision 1.313 by jsr166, Mon Apr 27 23:47:11 2020 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
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.
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="Advises user to run with -projecthelp">
46 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
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 -->
38  <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  
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"/>
48  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59
60  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63  <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 68 | 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"/>
82 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
83 <    <path id="bootclasspath@{v}">
84 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
85 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
86 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
87 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
88 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
89 <    </path>
90 <    <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 >
85 >  <macrodef name="mirror-dir">
86 >    <attribute name="src"/>
87 >    <attribute name="dst"/>
88 >    <sequential>
89 >    <delete dir="@{dst}"/>
90 >    <mkdir dir="@{dst}"/>
91 >    <copy todir="@{dst}" preservelastmodified="true">
92 >      <fileset dir="@{src}"/>
93 >    </copy>
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"/>
117 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
118 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
119 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
120 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
106 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107 <
108 <  <!-- Distribution locations -->
109 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
110 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
111 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
112 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
113 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
114 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
117 >
118 >  <!-- Javadoc locations -->
119 >  <property name="docs.dir"          location="${build.dir}/docs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
118  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
119  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
120  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
121  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
122  <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 2012-11 -->
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://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 <  <!-- 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="product.jar" default="${product.jar}"/>
172 <    <attribute name="jvmflags" default=""/>
171 >    <attribute name="classes"/>
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"/>
181  
182 <    <javac srcdir="${tck.src.dir}"
182 >    <javac srcdir="@{tck.src.dir}"
183             destdir="@{workdir}/tck-classes"
184             debug="${build.debug}"
185             debuglevel="${build.debuglevel}"
186             deprecation="${build.deprecation}"
187 <           source="6"
187 >           source="@{compile-target}"
188 >           target="@{compile-target}"
189             classpath="${junit.jar}"
164           bootclasspath="@{product.jar}:${bootclasspath6}"
190             includeAntRuntime="false"
191             includeJavaRuntime="false"
192 <           executable="${javac@{target}}"
192 >           encoding="ASCII"
193 >           executable="${javac@{compile-target}}"
194             fork="true">
195  
196 <      <include name="JSR166TestCase.java"/>
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  
204      </javac>
205  
206 <    <java classname="JSR166TestCase"
206 >    <java classname="${jsr166.tckTestClass}"
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
211 <        <jvmarg line="@{jvmflags}"/>
212 <        <classpath>
213 <          <pathelement location="${junit.jar}"/>
214 <          <pathelement location="@{workdir}/tck-classes"/>
215 <        </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 -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 +    <jtreg dir="${jtreg@{target}.src.dir}"
276 +           jdk="${jdk@{target}.home}"
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="-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>
294 +
295    <!-- ALoops classpath -->
296    <path id="loops.classpath">
297      <pathelement location="${build.loops.dir}"/>
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 <  <!-- TODO: How do we get &trade to work? -->
302 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
200 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
201 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
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 > <!--  Temporarily disable doclint, due to https://bugs.openjdk.java.net/browse/JDK-8214571 -->
356 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
357 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
358 >      <compilerarg value="-Werror"/>
359 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
360        <compilerarg line="${build.args}"/>
361  
362      </javac>
# Line 235 | Line 365
365  
366    <target name="jar"
367            depends="compile"
368 <          description="Builds library jar from compiled sources">
369 <
368 >          description="Builds library jar for src/main from compiled sources">
369 >    <local name="subdir"/>
370 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
371      <jar destfile="${product.jar}">
372 <      <fileset dir="${build.classes.dir}"/>
372 >      <fileset dir="${build.classes.dir}${subdir}"/>
373 >      <manifest>
374 >        <attribute name="Built-By" value="${user.name}"/>
375 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
376 >      </manifest>
377      </jar>
378    </target>
379  
380  
246  <target name="test"
247          depends="configure-tests, report-tests"
248          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
249
250
381    <target name="docs"
382            description="Builds javadocs for src/main to dist dir">
383  
384 <    <delete dir="${dist.javadocs.dir}"/>
385 <    <mkdir dir="${dist.javadocs.dir}"/>
384 >    <delete dir="${docs.dir}" quiet="true"/>
385 >    <mkdir dir="${docs.dir}"/>
386 >
387 >    <!-- old school frames via docs/index.html?overview-summary.html -->
388 >    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
389 >    <local name="use-frames"/>
390 >    <condition property="use-frames">
391 >      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
392 >    </condition>
393  
394      <!-- the packagenames="none" hack below prevents scanning the -->
395      <!-- sourcepath for packages -->
396  
397 <    <javadoc destdir="${dist.javadocs.dir}"
397 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
398 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
399 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
400 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
401 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
402 >    <javadoc destdir="${docs.dir}"
403               packagenames="none"
404 <             link="${jdkapi8docs.url}"
404 >             link="${java.api.url}"
405               overview="${src.dir}/intro.html"
406 <             sourcepath="${src.dir}:${jdk8src.dir}"
406 >             access="${build.javadoc.access}"
407 >             sourcepath="${src.dir}"
408               classpath=""
409 <             executable="${javadoc8}">
409 >             source="${build.main.javadoc.source}"
410 >             executable="${build.main.javadoc}">
411 > <!-- TODO: JDK-8214571 failonerror = "true" -->
412        <fileset dir="${src.dir}" defaultexcludes="yes">
413          <include name="**/*.java"/>
414        </fileset>
415 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
416 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
417 +      <arg value="-quiet"/>
418        <arg value="-XDignore.symbol.file=true"/>
419 <      <arg value="-tag"/>
420 <      <arg value="${javadoc.jls.option}"/>
419 >      <arg value="-html5"/>
420 >      <arg value="--patch-module=java.base=${src.dir}"/>
421 >      <arg value="--frames" if:set="use-frames"/>
422 >      <arg value="--override-methods=summary"/>
423 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
424 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
425 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
426 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
427 > <!-- tags added in jdk9: currently unused -->
428 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
429 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
430      </javadoc>
431    </target>
432  
433  
434    <target name="dist"
435 <          depends="dist-clean, dist-jar, docs"
435 >          depends="dist-clean, dist-jar, dist-docs"
436            description="Puts all distributable products in single hierarchy"/>
437  
438  
282  <target name="release"
283          depends="dist"
284          description="Puts entire CVS tree, plus distribution productions, in a jar">
285
286    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
287
288    <jar basedir="${basedir}" destfile="${release.jar}">
289      <!-- <exclude name="build/**"/> -->
290      <exclude name="${release.jar}"/>
291      <exclude name="user.properties"/>
292      <exclude name="etc/notes/**"/>
293      <exclude name="src/emulation/**"/>
294      <exclude name="**/SyntaxTest.java"/>
295      <exclude name="**/SuperfluousAbstract.java"/>
296    </jar>
297  </target>
298
299
439    <target name="clean"
440            description="Removes all build products">
302
441      <delete dir="${build.dir}"/>
304
442    </target>
443  
444  
445    <target name="dist-clean"
446            description="Removes all build and distribution products">
447 <
447 >    <delete dir="${build.dir}"/>
448      <delete dir="${dist.dir}"/>
312
449    </target>
450  
451  
316  <!-- Internal targets -->
317
318
452    <target name="dist-jar"
453            depends="clean, jar">
321
454      <copy file="${product.jar}" todir="${dist.dir}"/>
323
455    </target>
456  
457 <
458 <  <target name="compile-tests"
459 <          depends="jar">
329 <
330 <    <mkdir dir="${build.testcases.dir}"/>
331 <
332 <    <javac srcdir="${tck.src.dir}"
333 <           destdir="${build.testcases.dir}"
334 <           debug="${build.debug}"
335 <           debuglevel="${build.debuglevel}"
336 <           deprecation="${build.deprecation}"
337 <           source="6"
338 <           classpath="${junit.jar}"
339 <           bootclasspath="@{product.jar}:${bootclasspath6}"
340 <           includeAntRuntime="false"
341 <           includeJavaRuntime="false"
342 <           executable="${javac8}"
343 <           fork="true">
344 <
345 <      <include name="**/*.java"/>
346 <      <compilerarg value="-XDignore.symbol.file=true"/>
347 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
348 <      <compilerarg line="${build.args}"/>
349 <
350 <    </javac>
351 <
352 <    <javac srcdir="${test.src.dir}"
353 <           destdir="${build.testcases.dir}"
354 <           debug="${build.debug}"
355 <           debuglevel="${build.debuglevel}"
356 <           deprecation="${build.deprecation}"
357 <           source="6"
358 <           classpath=""
359 <           bootclasspath="@{product.jar}:${bootclasspath6}"
360 <           includeAntRuntime="false"
361 <           includeJavaRuntime="false"
362 <           executable="${javac8}"
363 <           fork="true">
364 <
365 <      <include name="jsr166/test/**/*.java"/>
366 <      <compilerarg value="-XDignore.symbol.file=true"/>
367 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
368 <      <compilerarg line="${build.args}"/>
369 <
370 <    </javac>
371 <
372 < <!--
373 <    <javac srcdir="${jtreg.src.dir}"
374 <          destdir="${build.testcases.dir}"
375 <            debug="${build.debug}"
376 <       debuglevel="${build.debuglevel}"
377 <      deprecation="${build.deprecation}"
378 <           source="${build.sourcelevel}"
379 <             fork="true">
380 <
381 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
382 <      <compilerarg value="-XDignore.symbol.file=true"/>
383 <      <compilerarg line="${build.args}"/>
384 <
385 <    </javac>
386 < -->
387 <
457 >  <target name="dist-docs"
458 >          depends="clean, docs">
459 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
460    </target>
461  
462 +  <target name="tck"
463 +          depends="jar"
464 +          description="Runs tck tests for src/main directly">
465  
466 <  <target name="run-tests"
467 <          depends="compile-tests">
468 <
469 <    <!-- May be overridden by user.properties -->
470 <    <property name="testcase" value="*"/>
471 <
472 <    <mkdir dir="${build.reports.dir}"/>
473 <
474 <    <junit printsummary="true"
475 <             showoutput="true"
476 <          errorProperty="junit.failed"
477 <        failureProperty="junit.failed"
478 <                    dir="${build.reports.dir}"
479 <                    jvm="${java8}"
480 <                   fork="true">
481 <
482 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
483 <      <jvmarg value="-server"/>
484 <      <jvmarg value="-showversion"/>
485 <
486 <      <classpath refid="test.classpath"/>
487 <
488 <      <formatter type="xml"/>
489 <
490 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
491 <        <fileset dir="${tck.src.dir}">
492 <          <include name="**/${testcase}Test.java"/>
493 <        </fileset>
494 <      </batchtest>
495 <
496 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
497 <        <fileset dir="${test.src.dir}">
498 <          <include name="jsr166/test/**/${testcase}Test.java"/>
499 <        </fileset>
500 <      </batchtest>
501 <
502 < <!--
503 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
429 <        <fileset dir="${jtreg.src.dir}">
430 <          <include name="**/${testcase}Test.java"/>
431 <        </fileset>
432 <      </batchtest>
433 < -->
434 <
435 <    </junit>
436 <
466 >    <run-tck-tests
467 >      target="${java.runtime.target}"
468 >      workdir="${build.dir}"
469 >      classes="${product.jar}">
470 >      <javac-elements>
471 >        <compilerarg value="-Werror"/>
472 >      </javac-elements>
473 >    </run-tck-tests>
474 >  </target>
475 >
476 >  <target name="tck-parallelism-1"
477 >          description="Runs tck with common pool parallelism 1">
478 >    <antcall target="tck">
479 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
480 >    </antcall>
481 >  </target>
482 >
483 >  <target name="tck-parallelism-0"
484 >          description="Runs tck with common pool parallelism 0">
485 >    <antcall target="tck">
486 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
487 >    </antcall>
488 >  </target>
489 >
490 >  <target name="tck-security-manager"
491 >          description="Runs tck with a security manager">
492 >    <antcall target="tck">
493 >      <param name="jsr166.useSecurityManager" value="true"/>
494 >    </antcall>
495 >  </target>
496 >
497 >  <target name="jtreg"
498 >          depends="jar"
499 >          description="Runs jtreg tests for src/main using the jtreg ant task">
500 >    <run-jtreg-tests
501 >       target="${java.runtime.target}"
502 >       workdir="${build.dir}"
503 >       classes="${product.jar}"/>
504    </target>
505  
506 +  <target name="test"
507 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
508 +          description="Runs tck and jtreg tests for src/main"/>
509  
510 <  <target name="report-tests"
511 <          depends="run-tests">
512 <
513 <    <!-- Sets junit.report.format to frames if redirection is present,
514 <         otherwise sets it to noframes. -->
515 <    <available property="junit.report.format"
516 <                  value="frames"
517 <              classname="org.apache.xalan.lib.Redirect"
518 <    />
519 <    <property name="junit.report.format" value="noframes"/>
520 <
521 <    <junitreport todir="${build.reports.dir}">
522 <      <fileset dir="${build.reports.dir}">
523 <        <include name="TEST-*.xml"/>
524 <      </fileset>
525 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
526 <      />
527 <    </junitreport>
528 <
529 <    <fail message="Test Cases Failed" if="junit.failed"/>
530 <
510 >  <target name="test-version-permutations"
511 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
512 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
513 >
514 >  <target name="test11">
515 >    <antcall>
516 >      <param name="java.runtime.target" value="11"/>
517 >      <param name="build.main.javac" value="${javac11}"/>
518 >      <param name="build.main.javadoc" value="${javadoc12}"/>
519 >      <param name="build.main.javadoc.source" value="11"/>
520 >      <target name="clean"/>
521 >      <target name="test"/>
522 >      <target name="docs"/>
523 >    </antcall>
524 >  </target>
525 >
526 >  <target name="test12">
527 >    <antcall>
528 >      <param name="java.runtime.target" value="12"/>
529 >      <param name="build.main.javac" value="${javac12}"/>
530 >      <param name="build.main.javadoc" value="${javadoc12}"/>
531 >      <param name="build.main.javadoc.source" value="12"/>
532 >      <target name="clean"/>
533 >      <target name="test"/>
534 >      <target name="docs"/>
535 >    </antcall>
536 >  </target>
537 >
538 >  <target name="test13">
539 >    <antcall>
540 >      <param name="java.runtime.target" value="13"/>
541 >      <param name="build.main.javac" value="${javac13}"/>
542 >      <param name="build.main.javadoc" value="${javadoc13}"/>
543 >      <param name="build.main.javadoc.source" value="13"/>
544 >      <target name="clean"/>
545 >      <target name="test"/>
546 >      <target name="docs"/>
547 >    </antcall>
548 >  </target>
549 >
550 >  <target name="test14">
551 >    <antcall>
552 >      <param name="java.runtime.target" value="14"/>
553 >      <param name="build.main.javac" value="${javac14}"/>
554 >      <param name="build.main.javadoc" value="${javadoc14}"/>
555 >      <param name="build.main.javadoc.source" value="14"/>
556 >      <target name="clean"/>
557 >      <target name="test"/>
558 >      <target name="docs"/>
559 >    </antcall>
560 >  </target>
561 >
562 >  <target name="test15">
563 >    <antcall>
564 >      <param name="java.runtime.target" value="15"/>
565 >      <param name="build.main.javac" value="${javac15}"/>
566 >      <param name="build.main.javadoc" value="${javadoc15}"/>
567 >      <param name="build.main.javadoc.source" value="15"/>
568 >      <target name="clean"/>
569 >      <target name="test"/>
570 >      <target name="docs"/>
571 >    </antcall>
572 >  </target>
573 >
574 >  <target name="test11-12">
575 >    <antcall>
576 >      <param name="java.runtime.target" value="12"/>
577 >      <param name="build.main.javac" value="${javac11}"/>
578 >      <param name="build.main.javadoc" value="${javadoc12}"/>
579 >      <param name="build.main.javadoc.source" value="11"/>
580 >      <target name="clean"/>
581 >      <target name="test"/>
582 >      <target name="docs"/>
583 >    </antcall>
584 >  </target>
585 >
586 >  <target name="test11-13">
587 >    <antcall>
588 >      <param name="java.runtime.target" value="13"/>
589 >      <param name="build.main.javac" value="${javac11}"/>
590 >      <param name="build.main.javadoc" value="${javadoc13}"/>
591 >      <param name="build.main.javadoc.source" value="11"/>
592 >      <target name="clean"/>
593 >      <target name="test"/>
594 >      <target name="docs"/>
595 >    </antcall>
596 >  </target>
597 >
598 >  <target name="test11-14">
599 >    <antcall>
600 >      <param name="java.runtime.target" value="14"/>
601 >      <param name="build.main.javac" value="${javac11}"/>
602 >      <param name="build.main.javadoc" value="${javadoc14}"/>
603 >      <param name="build.main.javadoc.source" value="11"/>
604 >      <target name="clean"/>
605 >      <target name="test"/>
606 >      <target name="docs"/>
607 >    </antcall>
608 >  </target>
609 >
610 >  <target name="test11-15">
611 >    <antcall>
612 >      <param name="java.runtime.target" value="15"/>
613 >      <param name="build.main.javac" value="${javac11}"/>
614 >      <param name="build.main.javadoc" value="${javadoc15}"/>
615 >      <param name="build.main.javadoc.source" value="11"/>
616 >      <target name="clean"/>
617 >      <target name="test"/>
618 >      <target name="docs"/>
619 >    </antcall>
620    </target>
621  
622  
623    <target name="configure-compiler">
624 +    <fail message="ant version too old">
625 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
626 +    </fail>
627  
628      <property name="unchecked.option" value="-Xlint:unchecked"/>
629  
# Line 478 | Line 640
640    </target>
641  
642  
643 <  <target name="configure-tests"
644 <       depends="configure-compiler">
483 <
484 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
485 <    <available property="junit.available"
486 <               classname="junit.framework.Protectable"/>
487 <
488 <    <!-- Xalan -->
489 <    <available property="xalan.available"
490 <               classname="org.apache.xalan.Version"/>
491 <
492 <
493 <    <!-- Ant 1.6beta and later don't need or want this check -->
494 <    <!--
495 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
496 <          unless="junit.available"/>
497 <
498 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
499 <          unless="xalan.available"/>
500 <    -->
501 <
502 <  </target>
503 <
504 <
505 <  <!-- Various demos and test programs -->
506 <
507 <
508 <  <target name="loops" depends="configure-compiler"
509 <          description="Benchmark from Doug Lea's AQS paper">
510 <
511 <    <mkdir dir="${build.loops.dir}"/>
512 <
513 <    <javac srcdir="${loops.src.dir}"
514 <          destdir="${build.loops.dir}"
515 <            debug="${build.debug}"
516 <       debuglevel="${build.debuglevel}"
517 <      deprecation="${build.deprecation}"
518 <           source="${build.sourcelevel}"
519 <             fork="true">
520 <
521 <      <compilerarg line="${build.args}"/>
522 <      <classpath refid="loops.classpath"/>
523 <      <compilerarg value="-XDignore.symbol.file=true"/>
524 <
525 <    </javac>
526 <
527 <    <java classname="ALoops" fork="true">
528 <      <classpath refid="loops.classpath"/>
529 <    </java>
530 <
531 <  </target>
532 <
533 <
534 <  <!-- jsr166 4jdk7 -->
535 <
536 <  <target name="4jdk7compile"
537 <          depends="configure-compiler"
538 <          description="Compiles src/jdk7 sources, targeting jdk7">
539 <
540 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
541 <
542 <    <javac srcdir="${4jdk7src.dir}"
543 <           destdir="${build.4jdk7.classes.dir}"
544 <           debug="${build.debug}"
545 <           debuglevel="${build.debuglevel}"
546 <           deprecation="${build.deprecation}"
547 <           source="6"
548 <           classpath=""
549 <           bootclasspath="${bootclasspath6}"
550 <           includeAntRuntime="false"
551 <           includeJavaRuntime="false"
552 <           executable="${javac7}"
553 <           fork="true">
554 <
555 <      <include name="**/*.java"/>
556 <      <compilerarg value="-XDignore.symbol.file=true"/>
557 <      <compilerarg value="-Xlint:all"/>
558 <      <compilerarg line="${build.args}"/>
559 <
560 <    </javac>
561 <  </target>
562 <
563 <
564 <  <target name="4jdk7-jar"
565 <          depends="4jdk7compile"
566 <          description="Builds library jar from compiled sources">
567 <
568 <    <jar destfile="${4jdk7product.jar}">
569 <      <fileset dir="${build.4jdk7.classes.dir}"/>
570 <    </jar>
571 <
572 <  </target>
573 <
574 <
575 <  <target name="4jdk7-test-tck"
576 <          depends="4jdk7-jar"
577 <          description="Runs tck tests for jsr166-4jdk7 directly">
578 <
579 <    <run-tck-tests
580 <      target="7"
581 <      workdir="${build.4jdk7.dir}"
582 <      product.jar="${4jdk7product.jar}"/>
583 <  </target>
584 <
585 <
586 <  <target name="4jdk7-test-tck-junit"
587 <          depends="4jdk7compile"
588 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
589 <
590 <    <junit printsummary="true"
591 <           showoutput="true"
592 <           errorProperty="junit.failed"
593 <           failureProperty="junit.failed"
594 <           includeantruntime="true"
595 <           jvm="${java7}"
596 <           fork="true">
597 <
598 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
599 <      <jvmarg value="-server"/>
600 <
601 <      <classpath>
602 <        <pathelement location="${junit.jar}"/>
603 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
604 <      </classpath>
605 <
606 <      <formatter type="brief"/>
607 <
608 <      <test name="JSR166TestCase" haltonfailure="no">
609 <      </test>
610 <
611 <    </junit>
612 <  </target>
613 <
614 <  <target name="4jdk7-test-jtreg"
615 <          depends="4jdk7compile"
616 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
617 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
618 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
619 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
620 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
621 <    <jtreg dir="${jtreg.src.dir}"
622 <           jdk="${jdk7.home}"
623 <           workDir="${build.4jdk7.dir}/JTwork"
624 <           reportDir="${build.4jdk7.dir}/JTreport">
625 <
626 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
627 <      <arg value="-agentvm"/>
628 <      <arg value="-v:nopass,fail"/>
629 <      <arg value="-vmoptions:-esa -ea"/>
630 <      <arg value="-automatic"/>
631 <      <arg value="-k:!ignore"/>
632 <    </jtreg>
633 <  </target>
634 <
635 <
636 <  <target name="4jdk7-test"
637 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
638 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
639 <  </target>
640 <
641 <
642 <  <target name="4jdk7docs"
643 <          description="Builds javadocs for src/jdk7 to dist dir">
644 <
645 <    <delete dir="${dist.4jdk7.docs.dir}"/>
646 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
647 <
648 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
649 <             packagenames="none"
650 <             link="${jdkapi7docs.url}"
651 <             overview="${4jdk7src.dir}/intro.html"
652 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
653 <             classpath=""
654 <             executable="${javadoc7}">
655 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
656 <        <include name="**/*.java"/>
657 <      </fileset>
658 <      <arg value="-XDignore.symbol.file=true"/>
659 <    </javadoc>
660 <  </target>
661 <
662 <
663 <  <target name="4jdk7dist"
664 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
665 <          description="Puts all distributable products in single hierarchy"/>
666 <
667 <
668 <  <target name="4jdk7clean"
669 <          description="Removes all 4jdk7 build products">
670 <
671 <    <delete dir="${build.4jdk7.dir}"/>
672 <
673 <  </target>
674 <
675 <
676 <  <target name="4jdk7dist-clean"
677 <          description="Removes all build and distribution products">
678 <
679 <  </target>
680 <
681 <  <target name="4jdk7dist-jar"
682 <          depends="4jdk7clean, 4jdk7-jar">
643 >  <target name="compile-test-loops" depends="jar"
644 >          description="Compiles all the perf tests in src/test/loops">
645  
646 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
646 >    <mkdir dir="${build.dir}/test/loops"/>
647  
648 <  </target>
649 <
688 <
689 <  <!-- jsr166x -->
690 <
691 <  <target name="jsr166xcompile"
692 <          depends="configure-compiler"
693 <          description="Compiles jsr166x sources to build dir">
694 <
695 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
696 <
697 <    <javac srcdir="${topsrc.dir}"
698 <           destdir="${build.jsr166x.classes.dir}"
648 >    <javac srcdir="${basedir}/src/test/loops"
649 >           destdir="${build.dir}/test/loops"
650             debug="${build.debug}"
651             debuglevel="${build.debuglevel}"
652             deprecation="${build.deprecation}"
702           classpath=""
703           bootclasspath="${bootclasspath6}"
704           source="5"
653             includeAntRuntime="false"
654             includeJavaRuntime="false"
655 <           executable="${javac7}"
655 >           encoding="ASCII"
656 >           executable="${build.main.javac}"
657             fork="true">
658  
659 <      <include name="jsr166x/**/*.java"/>
659 >      <include name="*.java"/>
660        <compilerarg value="-XDignore.symbol.file=true"/>
661 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
662 <      <compilerarg line="${build.args}"/>
714 <
715 <    </javac>
716 <  </target>
717 <
718 <
719 <  <target name="jsr166x-jar"
720 <          depends="jsr166xcompile"
721 <          description="Builds library jar from compiled sources">
722 <
723 <    <jar destfile="${jsr166x.jar}">
724 <      <fileset dir="${build.jsr166x.classes.dir}"/>
725 <    </jar>
726 <
727 <  </target>
728 <
729 <
730 <  <target name="jsr166xdocs"
731 <          description="Builds javadocs to dist dir">
732 <
733 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
734 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
735 <
736 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
737 <             packagenames="jsr166x.*"
738 <             link="${jdkapidocs.url}"
739 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
740 <             bootclasspath="${bootclasspath6}"
741 <             source="5"
742 <             executable="${javadoc7}">
743 <      <arg value="-XDignore.symbol.file=true"/>
744 <
745 <    </javadoc>
746 <  </target>
747 <
748 <
749 <  <target name="jsr166xdist"
750 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
751 <          description="Puts all distributable products in single hierarchy"/>
752 <
753 <
754 <  <target name="jsr166xclean"
755 <          description="Removes all jsr166x build products">
756 <
757 <    <delete dir="${build.jsr166x.dir}"/>
758 <
759 <  </target>
760 <
761 <
762 <  <target name="jsr166xdist-clean"
763 <          description="Removes all build and distribution products">
764 <
765 <  </target>
766 <
767 <
768 <  <target name="jsr166xdist-jar"
769 <          depends="jsr166xclean, jsr166x-jar">
770 <
771 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
772 <
773 <  </target>
774 <
775 <  <!-- jsr166y -->
776 <
777 <
778 <  <target name="jsr166ycompile"
779 <          depends="configure-compiler"
780 <          description="Compiles jsr166y sources">
781 <
782 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
783 <
784 <    <javac srcdir="${topsrc.dir}"
785 <           destdir="${build.jsr166y.classes.dir}"
786 <           debug="${build.debug}"
787 <           debuglevel="${build.debuglevel}"
788 <           deprecation="${build.deprecation}"
789 <           source="6"
790 <           classpath=""
791 <           bootclasspath="${bootclasspath6}"
792 <           includeAntRuntime="false"
793 <           includeJavaRuntime="false"
794 <           executable="${javac7}"
795 <           fork="true">
796 <
797 <      <include name="jsr166y/**/*.java"/>
798 <      <compilerarg value="-XDignore.symbol.file=true"/>
799 <      <compilerarg value="-Xlint:all"/>
800 <      <compilerarg line="${build.args}"/>
801 <
802 <    </javac>
803 <  </target>
804 <
805 <
806 <  <target name="jsr166y-jar"
807 <          depends="jsr166ycompile"
808 <          description="Builds library jar from compiled sources">
809 <
810 <    <jar destfile="${jsr166y.jar}" index="true">
811 <      <fileset dir="${build.jsr166y.classes.dir}"/>
812 <    </jar>
813 <
814 <  </target>
815 <
816 <
817 <  <target name="jsr166ydocs"
818 <          description="Builds javadocs to dist dir">
819 <
820 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
821 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
822 <
823 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
824 <             packagenames="jsr166y.*"
825 <             link="${jdkapidocs.url}"
826 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
827 <             bootclasspath="${bootclasspath6}"
828 <             source="6"
829 <             executable="${javadoc7}">
830 <      <arg value="-XDignore.symbol.file=true"/>
831 <
832 <    </javadoc>
833 <  </target>
834 <
835 <
836 <  <target name="jsr166ydist"
837 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
838 <          description="Puts all distributable products in single hierarchy"/>
839 <
840 <
841 <  <target name="jsr166yclean"
842 <          description="Removes all jsr166y build products">
843 <
844 <    <delete dir="${build.jsr166y.dir}"/>
845 <
846 <  </target>
847 <
848 <
849 <  <target name="jsr166ydist-clean"
850 <          description="Removes all build and distribution products">
851 <
852 <  </target>
853 <
854 <  <target name="jsr166ydist-jar"
855 <          depends="jsr166yclean, jsr166y-jar">
856 <
857 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
858 <
859 <  </target>
860 <
861 <
862 <  <!-- extra166y -->
863 <
864 <
865 <  <target name="extra166ycompile"
866 <          depends="configure-compiler, jsr166y-jar"
867 <          description="Compiles extra166y sources">
868 <
869 <    <mkdir dir="${build.extra166y.classes.dir}"/>
870 <
871 <    <javac srcdir="${topsrc.dir}"
872 <           destdir="${build.extra166y.classes.dir}"
873 <           debug="${build.debug}"
874 <           debuglevel="${build.debuglevel}"
875 <           deprecation="${build.deprecation}"
876 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
877 <           classpath=""
878 <           source="6"
879 <           includeAntRuntime="false"
880 <           includeJavaRuntime="false"
881 <           executable="${javac7}"
882 <           fork="true">
883 <
884 <      <include name="extra166y/**/*.java"/>
885 <      <compilerarg value="-XDignore.symbol.file=true"/>
886 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
661 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
662 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
663        <compilerarg line="${build.args}"/>
888
664      </javac>
665    </target>
666  
667  
668 <  <target name="extra166y-jar"
669 <          depends="extra166ycompile"
670 <          description="Builds library jar from compiled sources">
671 <
672 <    <jar destfile="${extra166y.jar}" index="true">
673 <      <fileset dir="${build.extra166y.classes.dir}"/>
674 <    </jar>
900 <
901 <  </target>
902 <
903 <
904 <  <target name="extra166ydocs"
905 <          description="Builds javadocs to build dir">
906 <
907 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
908 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
909 <
910 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
911 <             packagenames="extra166y.*"
912 <             link="${jdkapidocs.url}"
913 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
914 <             bootclasspath="${bootclasspath6}"
915 <             source="6"
916 <             executable="${javadoc7}">
917 <      <arg value="-XDignore.symbol.file=true"/>
918 <
919 <    </javadoc>
920 <  </target>
921 <
922 <
923 <  <target name="extra166ydist"
924 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
925 <          description="Puts all distributable products in single hierarchy"/>
926 <
668 >  <!-- old branches no longer maintained.  build support deleted -->
669 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
670 >  <!-- jsr166 4jdk7 (no longer maintained) -->
671 >  <!-- jsr166x (no longer maintained) -->
672 >  <!-- jsr166y (no longer maintained) -->
673 >  <!-- extra166y (no longer maintained) -->
674 >  <!-- jsr166e (no longer maintained) -->
675  
676 <  <target name="extra166yclean"
929 <          description="Removes all extra166y build products">
676 > <!-- Find buglets that can be detected by static build tools -->
677  
678 <    <delete dir="${build.extra166y.dir}"/>
679 <
680 <  </target>
681 <
682 <
936 <  <target name="extra166ydist-clean"
937 <          description="Removes all build and distribution products">
678 > <!--   <target name="lint"> -->
679 > <!--     <antcall target="dists"> -->
680 > <!--       <param name="build.javadoc.access" value="protected"/> -->
681 > <!--     </antcall> -->
682 > <!--   </target> -->
683  
684 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
685 +  <target name="doclint-private">
686 +    <antcall target="dist">
687 +      <param name="build.javadoc.access" value="private"/>
688 +    </antcall>
689    </target>
690  
941  <target name="extra166ydist-jar"
942          depends="extra166yclean, extra166y-jar">
943
944    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
945
946  </target>
947
948  <!-- jsr166e -->
949
950  <target name="jsr166ecompile"
951          depends="configure-compiler"
952          description="Compiles jsr166e sources">
691  
692 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
692 > <!-- ==============================================================
693 >  Experimental errorprone support
694 >  https://errorprone.info
695 >  https://errorprone.info/docs/installation
696 >  https://github.com/google/error-prone/issues/1143
697 > =================================================================== -->
698 >  <path id="errorprone.processorpath.path">
699 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
700 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
701 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
702 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
703 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
704 >  </path>
705 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
706 >  <property name="errorprone.jsr166.user.flags" value=""/>
707 >  <property name="errorprone.jsr166.flags"
708 >            value="-Xep:HashtableContains:OFF
709 >                   -Xep:JdkObsolete:OFF
710 >                   -Xep:MissingOverride:OFF
711 >                   -Xep:MissingFail:OFF
712 >                   -Xep:ThreadPriorityCheck:OFF
713 >                   -Xep:MixedArrayDimensions:ERROR
714 >                   -Xep:RemoveUnusedImports:ERROR
715 >                   -Xep:EmptyIf:ERROR
716 >                   -Xep:MultipleTopLevelClasses:ERROR
717 >                   -Xep:ClassName:ERROR
718 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
719 >                   -Xep:RedundantThrows:ERROR
720 >                   -Xep:IdentityBinaryExpression:WARN
721 >                   -Xep:ConstructorInvokesOverridable:WARN
722 >                   -Xep:MethodCanBeStatic:WARN
723 >                   ${errorprone.jsr166.user.flags}"/>
724 >  <!-- -Xep:WildcardImport:ERROR -->
725 >  <property name="errorprone.jsr166.test.flags"
726 >            value="-Xep:StringSplitter:OFF
727 >                   -Xep:BoxedPrimitiveConstructor:OFF
728 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
729 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
730 >  <target name="errorprone"
731 >          depends="clean, configure-compiler"
732 >          description="Run errorprone over jsr166 source code (experimental)">
733 >
734 >    <local name="destdir"/>
735 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
736 >    <mkdir dir="${destdir}"/>
737  
738 <    <javac srcdir="${topsrc.dir}"
739 <           destdir="${build.jsr166e.classes.dir}"
738 >    <javac srcdir="${src.dir}"
739 >           destdir="${destdir}"
740             debug="${build.debug}"
741             debuglevel="${build.debuglevel}"
742             deprecation="${build.deprecation}"
961           source="7"
743             classpath=""
744             includeAntRuntime="false"
745             includeJavaRuntime="false"
746 <           executable="${javac7}"
746 >           encoding="ASCII"
747 >           executable="${build.main.javac}"
748             fork="true">
749  
750 <      <include name="jsr166e/**/*.java"/>
750 >      <include name="**/*.java"/>
751 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
752 >      <compilerarg value="-J--illegal-access=permit"/>
753 >      <compilerarg value="-XDcompilePolicy=simple"/>
754 >      <compilerarg value="-processorpath"/>
755 >      <compilerarg pathref="errorprone.processorpath.path"/>
756 >      <compilerarg value="-Xplugin:ErrorProne
757 >                          ${errorprone.jsr166.flags}"/>
758 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
759 >      <compilerarg value="-Xprefer:source"/>
760        <compilerarg value="-XDignore.symbol.file=true"/>
761        <compilerarg value="-Xlint:all"/>
762 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
763 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
764        <compilerarg line="${build.args}"/>
972
765      </javac>
974  </target>
975
766  
767 <  <target name="jsr166e-jar"
768 <          depends="jsr166ecompile"
979 <          description="Builds library jar from compiled sources">
980 <
981 <    <jar destfile="${jsr166e.jar}" index="true">
982 <      <fileset dir="${build.jsr166e.classes.dir}"/>
767 >    <jar destfile="${product.jar}">
768 >      <fileset dir="${destdir}"/>
769      </jar>
770  
771 <  </target>
772 <
773 <
774 <  <target name="jsr166edocs"
775 <          description="Builds javadocs to build dir">
776 <
777 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
778 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
779 <
780 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
781 <             packagenames="jsr166e.*"
782 <             link="${jdkapidocs.url}"
783 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
784 <             source="7"
785 <             executable="${javadoc7}">
786 <      <arg value="-XDignore.symbol.file=true"/>
787 <
788 <    </javadoc>
789 <  </target>
790 <
791 <
792 <  <target name="jsr166edist"
793 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
794 <          description="Puts all distributable products in single hierarchy"/>
795 <
796 <
797 <  <target name="jsr166eclean"
798 <          description="Removes all jsr166e build products">
799 <
800 <    <delete dir="${build.jsr166e.dir}"/>
801 <
802 <  </target>
803 <
804 <
805 <  <target name="jsr166edist-clean"
806 <          description="Removes all build and distribution products">
807 <
808 <  </target>
809 <
810 <  <target name="jsr166edist-jar"
811 <          depends="jsr166eclean, jsr166e-jar">
812 <
813 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
771 >    <run-tck-tests
772 >      target="${java.runtime.target}"
773 >      workdir="${build.dir}"
774 >      classes="${product.jar}">
775 >      <javac-elements>
776 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
777 >        <compilerarg value="-J--illegal-access=permit"/>
778 >        <compilerarg value="-XDcompilePolicy=simple"/>
779 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
780 >        <compilerarg value="-Xplugin:ErrorProne
781 >                            ${errorprone.jsr166.flags}
782 >                            ${errorprone.jsr166.test.flags}"/>
783 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
784 >      </javac-elements>
785 >    </run-tck-tests>
786 >  </target>
787 >
788 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
789 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
790 >  <target name="errorprone-jtreg"
791 >          depends="jar"
792 >          description="Run errorprone over jtreg tests (experimental)">
793 >
794 >    <run-jtreg-tests
795 >       target="${java.runtime.target}"
796 >       workdir="${build.dir}"
797 >       classes="${product.jar}"
798 >       verbose="all">
799 >      <jtreg-elements>
800 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
801 >        <arg value="-javacoption:-processorpath"/>
802 >        <arg value="-javacoption:${errorprone.processorpath}"/>
803 >        <arg value="-javacoption:-Xplugin:ErrorProne
804 >                            ${errorprone.jsr166.flags}
805 >                            ${errorprone.jsr166.test.flags}
806 >                            -Xep:MultipleTopLevelClasses:WARN
807 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
808 >      </jtreg-elements>
809 >    </run-jtreg-tests>
810 >  </target>
811 >
812 >
813 > <!-- ==============================================================
814 >  Running guava tests against jsr166 code
815 > =================================================================== -->
816 >
817 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
818 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
819 > <!-- <property name="guava.version" value="21.0"/> -->
820 >
821 > <!-- HOWTO debug print a path id -->
822 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
823 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
824 >
825 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
826 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
827 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
828 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
829 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
830 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
831 >
832 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
833 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
834 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
835 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
836 >
837 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
838 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
839 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
840 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
841 >
842 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
843 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
844 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
845 >
846 >  <target name="init-ivy">
847 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
848 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
849 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
850 >             classpath="${build.dir}/ivy.jar"/>
851 >  </target>
852 >
853 >  <target name="guava-tests" depends="jar, init-ivy"
854 >          description="Guava tests run against jsr166 collections">
855 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
856 >    <mkdir dir="${guava.dir}"/>
857 >    <ivy:retrieve pathid="guava.testlib.classpath"
858 >      type="jar,bundle" inline="true" conf="default,master"
859 >      pattern="${guava.dir}/[artifact].[ext]"
860 >      organisation="com.google.guava" module="guava-testlib"/>
861 >    <property name="guava.version" value="21.0"/>
862 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
863 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
864 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
865 >           jvm="${build.main.java}" fork="true">
866 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
867 >      <formatter type="brief"/>
868 >      <classpath>
869 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
870 >        <path refid="guava.testlib.classpath"/>
871 >      </classpath>
872  
873 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
874 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
875 +    </junit>
876    </target>
877  
878   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines