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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines