ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.205 by jsr166, Sat Mar 26 17:35:47 2016 UTC vs.
Revision 1.235 by jsr166, Sun Mar 19 01:37:51 2017 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless">
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless"
3	>	xmlns:ivy="antlib:org.apache.ivy.ant">
4
5		<description>
6		------------------------------------------------------------------------------
#	Line 17 | Line 18
18		itself.  Because the JDK version matters and because different
19		targets require different JDKs, we assume that users have created a
20		hierarchy containing:
20	–	$HOME/jdk/jdk6
21		$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24	+	$HOME/jdk/jdk10
25		where each of the above is a JDK or a symlink to same, and
25	–	$HOME/jdk/src/jdk6
26		$HOME/jdk/src/jdk7
27		$HOME/jdk/src/jdk8
28		$HOME/jdk/src/jdk9
29	+	$HOME/jdk/src/jdk10
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) 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 6 7 8 9 ...
35	>	for $N in 7 8 9 10 ...
36
37	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
37	>	As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
#	Line 63 | Line 63
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
64		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 134 | Line 133
133		<defjdklocations v="7"/>
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136	+	<defjdklocations v="10"/>
137
138		<!-- Source locations -->
139		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 143 | Line 143
143		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
148		<property name="lib.dir"              location="${basedir}/lib"/>
149		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 186 | Line 187
187		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
188		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
189		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
190	<	<!-- The expected canonical location does not yet exist as of 2016-03 -->
190	>	<!-- The expected canonical location does not yet exist as of 2016-04 -->
191		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
192	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193		<!-- Default jdk doc location (latest stable release seems best) -->
194		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
195
#	Line 245 | Line 246
246		classpath="${junit.jar}"
247		includeAntRuntime="false"
248		includeJavaRuntime="false"
249	+	encoding="ASCII"
250		executable="${javac@{compile-target}}"
251		fork="true">
252
253		<include name="*.java"/>
254		<compilerarg value="-XDignore.symbol.file=true"/>
255		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
256	+	<compilerarg value="-Xdoclint:reference/private"/>
257		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
258	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
259		<compilerarg line="${build.args}"/>
260		<javac-elements/>
261
#	Line 263 | Line 266
266		jvm="${java@{target}}"
267		fork="true">
268		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
269	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
269	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
270	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
271	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
272	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
273	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
274	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
275		<jvmarg line="@{jvmflags}"/>
276	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
277	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
278
279	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
279	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
280		<syspropertyset id="system-properties-used-by-tck">
281		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
282		<propertyref prefix="jsr166."/>
#	Line 292 | Line 302
302		<fileset dir="${jtreg8.src.dir}">
303		<patternset id="jdk8.jtreg.tests">
304		<include name="**/*.java"/>
295	–	<exclude name="**/SpliteratorCharacteristics.java"/>
296	–	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
297	–	<exclude name="**/GCDuringIteration.java"/>
305		</patternset>
306		</fileset>
307
#	Line 326 | Line 333
333		</condition>
334
335		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
330	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
331	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	–	<mkdir dir="@{workdir}/JTreport/html"/>
333	–	<mkdir dir="@{workdir}/JTreport/text"/>
336		<jtreg dir="${jtreg@{target}.src.dir}"
337		jdk="${jdk@{target}.home}"
338	<	workDir="@{workdir}/JTwork"
337	<	reportDir="@{workdir}/JTreport">
338	>	workDir="@{workdir}/JTwork">
339		<patternset refid="jdk@{target}.jtreg.tests"/>
340		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
341	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
341	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
343		<arg value="-agentvm"/>
344	+	<arg value="-noreport"/>
345		<arg value="-verbose:${jtreg.verbose}"/>
346		<arg value="-vmoptions:-esa -ea"/>
347		<arg value="-automatic"/>
#	Line 393 | Line 396
396		classpath=""
397		includeAntRuntime="false"
398		includeJavaRuntime="false"
399	+	encoding="ASCII"
400		executable="${build.main.javac}"
401		fork="true">
402
403		<include name="**/*.java"/>
404	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
404	>	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
405		<compilerarg value="-Xprefer:source"/>
406		<compilerarg value="-XDignore.symbol.file=true"/>
407		<compilerarg value="-Xlint:all"/>
408		<compilerarg value="-Werror"/>
409	<	<compilerarg value="-Xdoclint:all/protected"/>
409	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
410		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
411		<compilerarg line="${build.args}"/>
412
#	Line 413 | Line 417
417		<target name="jar"
418		depends="compile"
419		description="Builds library jar for src/main from compiled sources">
420	<
420	>	<local name="subdir"/>
421	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
422		<jar destfile="${product.jar}">
423	<	<fileset dir="${build.classes.dir}"/>
423	>	<fileset dir="${build.classes.dir}${subdir}"/>
424		<manifest>
425		<attribute name="Built-By" value="${user.name}"/>
426		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 433 | Line 438
438		<!-- the packagenames="none" hack below prevents scanning the -->
439		<!-- sourcepath for packages -->
440
441	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
442	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
443	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
444	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
445	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
446		<javadoc destdir="${docs.dir}"
447		packagenames="none"
448		link="${java9.api.url}"
449		overview="${src.dir}/intro.html"
450		access="${build.javadoc.access}"
451	<	sourcepath="${src.dir}:${jdk9.src.dir}"
451	>	sourcepath="${src.dir}"
452		classpath=""
453		executable="${javadoc9}">
454		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 447 | Line 457
457		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
458		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
459		<arg value="-XDignore.symbol.file=true"/>
460	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
460	>	<arg value="--patch-module=java.base=${src.dir}"/>
461		<arg value="-tag"/>
462		<arg value="${javadoc.jls.option}"/>
463	+	<!-- @apiNote currently unused -->
464	+	<!--       <arg value="-tag"/> -->
465	+	<!--       <arg value="apiNote:a:API Note:"/> -->
466		<arg value="-tag"/>
467	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
455	<	<arg value="-tag"/>
456	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
457	<	<arg value="-tag"/>
458	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
459	<	<!-- tags added in jdk9 -->
460	<	<arg value="-tag"/>
461	<	<arg value="revised:X"/>
467	>	<arg value="implSpec:a:Implementation Requirements:"/>
468		<arg value="-tag"/>
469	<	<arg value="spec:X"/>
469	>	<arg value="implNote:a:Implementation Note:"/>
470	>	<!-- tags added in jdk9: currently unused -->
471	>	<!--       <arg value="-tag"/> -->
472	>	<!--       <arg value="revised:X"/> -->
473	>	<!--       <arg value="-tag"/> -->
474	>	<!--       <arg value="spec:X"/> -->
475		</javadoc>
476		</target>
477
#	Line 530 | Line 541
541		</target>
542
543		<target name="tck-parallelism-1"
544	<	description="Runs tck with given common pool parallelism">
544	>	description="Runs tck with common pool parallelism 1">
545		<antcall target="tck">
546		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
547		</antcall>
548		</target>
549
550		<target name="tck-parallelism-0"
551	<	description="Runs tck with given common pool parallelism">
551	>	description="Runs tck with common pool parallelism 0">
552		<antcall target="tck">
553		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
554		</antcall>
555		</target>
556
557	+	<target name="tck-security-manager"
558	+	description="Runs tck with a security manager">
559	+	<antcall target="tck">
560	+	<param name="jsr166.useSecurityManager" value="true"/>
561	+	</antcall>
562	+	</target>
563	+
564		<target name="jtreg"
565		depends="jar"
566		description="Runs jtreg tests for src/main using the jtreg ant task">
#	Line 553 | Line 571
571		</target>
572
573		<target name="test"
574	<	depends="tck, tck-parallelism-1, jtreg"
574	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
575		description="Runs tck and jtreg tests for src/main">
576		</target>
577
#	Line 623 | Line 641
641		deprecation="${build.deprecation}"
642		source="${build.sourcelevel}"
643		target="${build.sourcelevel}"
644	+	encoding="ASCII"
645		fork="true">
646
647		<compilerarg line="${build.args}"/>
#	Line 650 | Line 669
669		deprecation="${build.deprecation}"
670		includeAntRuntime="false"
671		includeJavaRuntime="false"
672	+	encoding="ASCII"
673		executable="${javac9}"
674		fork="true">
675
#	Line 683 | Line 703
703		bootclasspath="${bootclasspath8}"
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
706	+	encoding="ASCII"
707		executable="${javac8}"
708		fork="true">
709
#	Line 713 | Line 734
734		bootclasspath="${bootclasspath8}"
735		includeAntRuntime="false"
736		includeJavaRuntime="false"
737	+	encoding="ASCII"
738		executable="${javac8}"
739		fork="true">
740
#	Line 720 | Line 742
742		<compilerarg value="-Xprefer:source"/>
743		<compilerarg value="-XDignore.symbol.file=true"/>
744		<compilerarg value="-Xlint:all"/>
745	<	<compilerarg value="-Xdoclint:all/protected"/>
745	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
746		<compilerarg line="${build.args}"/>
747
748		</javac>
#	Line 788 | Line 810
810		access="${build.javadoc.access}"
811		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
812		classpath=""
813	<	executable="${javadoc8}">
813	>	executable="${javadoc8}"
814	>	failonerror = "true">
815		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
816		<include name="**/*.java"/>
817		</fileset>
#	Line 796 | Line 819
819		<arg value="-XDignore.symbol.file=true"/>
820		<arg value="-tag"/>
821		<arg value="${javadoc.jls.option}"/>
822	<	<arg value="-tag"/>
823	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
822	>	<!-- @apiNote currently unused -->
823	>	<!--       <arg value="-tag"/> -->
824	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
825		<arg value="-tag"/>
826		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
827		<arg value="-tag"/>
#	Line 851 | Line 875
875		bootclasspath="${bootclasspath6}"
876		includeAntRuntime="false"
877		includeJavaRuntime="false"
878	+	encoding="ASCII"
879		executable="${javac7}"
880		fork="true">
881
#	Line 881 | Line 906
906		bootclasspath="${bootclasspath6}"
907		includeAntRuntime="false"
908		includeJavaRuntime="false"
909	+	encoding="ASCII"
910		executable="${javac8}"
911		fork="true">
912
#	Line 993 | Line 1019
1019		access="${build.javadoc.access}"
1020		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1021		classpath=""
1022	<	executable="${javadoc7}">
1022	>	executable="${javadoc7}"
1023	>	failonerror = "true">
1024		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1025		<include name="**/*.java"/>
1026		</fileset>
#	Line 1047 | Line 1074
1074		target="5"
1075		includeAntRuntime="false"
1076		includeJavaRuntime="false"
1077	+	encoding="ASCII"
1078		executable="${javac7}"
1079		fork="true">
1080
#	Line 1088 | Line 1116
1116		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1117		bootclasspath="${bootclasspath6}"
1118		source="5"
1119	<	executable="${javadoc7}">
1119	>	executable="${javadoc7}"
1120	>	failonerror = "true">
1121		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1122		<arg value="-XDignore.symbol.file=true"/>
1123
#	Line 1139 | Line 1168
1168		bootclasspath="${bootclasspath6}"
1169		includeAntRuntime="false"
1170		includeJavaRuntime="false"
1171	+	encoding="ASCII"
1172		executable="${javac7}"
1173		fork="true">
1174
#	Line 1180 | Line 1210
1210		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1211		bootclasspath="${bootclasspath6}"
1212		source="6"
1213	<	executable="${javadoc7}">
1213	>	executable="${javadoc7}"
1214	>	failonerror = "true">
1215		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1216		<arg value="-XDignore.symbol.file=true"/>
1217
#	Line 1232 | Line 1263
1263		target="6"
1264		includeAntRuntime="false"
1265		includeJavaRuntime="false"
1266	+	encoding="ASCII"
1267		executable="${javac7}"
1268		fork="true">
1269
#	Line 1393 | Line 1425
1425		access="${build.javadoc.access}"
1426		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1427		source="${build.jsr166e.java.version}"
1428	<	executable="${javadoc7}">
1428	>	executable="${javadoc7}"
1429	>	failonerror = "true">
1430		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1431		<arg value="-XDignore.symbol.file=true"/>
1432
#	Line 1478 | Line 1511
1511		</antcall>
1512		</target>
1513
1514	+	<!-- ==============================================================
1515	+	Running guava tests against jsr166 code
1516	+	=================================================================== -->
1517	+
1518	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1519	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1520	+	<!-- <property name="guava.version" value="21.0"/> -->
1521	+
1522	+	<!-- HOWTO debug print a path id -->
1523	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1524	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1525	+
1526	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1527	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1528	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1529	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1530	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1531	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1532	+
1533	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1534	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1535	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1536	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1537	+
1538	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1539	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1540	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1541	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1542	+
1543	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1544	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1545	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1546	+
1547	+	<target name="init-ivy">
1548	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1549	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1550	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1551	+	classpath="${build.dir}/ivy.jar"/>
1552	+	</target>
1553	+
1554	+	<target name="guava-tests" depends="jar, init-ivy"
1555	+	description="Guava tests run against jsr166 collections">
1556	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1557	+	<mkdir dir="${guava.dir}"/>
1558	+	<ivy:retrieve pathid="guava.testlib.classpath"
1559	+	type="jar,bundle" inline="true" conf="default,master"
1560	+	pattern="${guava.dir}/[artifact].[ext]"
1561	+	organisation="com.google.guava" module="guava-testlib"/>
1562	+	<property name="guava.version" value="21.0"/>
1563	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1564	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1565	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1566	+	jvm="${java9}" fork="true">
1567	+	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1568	+	<formatter type="brief"/>
1569	+	<classpath>
1570	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1571	+	<path refid="guava.testlib.classpath"/>
1572	+	</classpath>
1573	+
1574	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1575	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1576	+	</junit>
1577	+	</target>
1578
1579		</project>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines