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.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC vs.
Revision 1.267 by jsr166, Tue Feb 27 21:18:06 2018 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"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 21 | Line 22
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26    where each of the above is a JDK or a symlink to same, and
27    $HOME/jdk/src/jdk8
28    $HOME/jdk/src/jdk9
29    $HOME/jdk/src/jdk10
30 +  $HOME/jdk/src/jdk11
31    where each of the above is a complete JDK source tree
32    (e.g. mercurial forest) or a symlink to same.
33  
# Line 132 | Line 135
135    <defjdklocations v="8"/>
136    <defjdklocations v="9"/>
137    <defjdklocations v="10"/>
138 +  <defjdklocations v="11"/>
139  
140    <!-- Source locations -->
141    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 146
146    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 186
186    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187  
188    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
190 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
191 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
192 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
193 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
194 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
195 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
189 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
190 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
191 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
192 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 >  <!-- The location of jdk9 early access docs (RIP) -->
196 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
197    <!-- Default jdk doc location (latest stable release seems best) -->
198 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
198 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
199 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
201  
202    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
203    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 205
205    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
208 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
209 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
210    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
211  
212    <!-- Define the "jtreg" task -->
# Line 296 | Line 306
306    </macrodef>
307  
308    <!-- Define jtreg test sets for different jdk versions -->
309 <  <fileset dir="${jtreg10.src.dir}">
310 <    <patternset id="jdk10.jtreg.tests">
311 <      <include name="**/*.java"/>
312 <    </patternset>
313 <  </fileset>
314 <
315 <  <fileset dir="${jtreg9.src.dir}">
316 <    <patternset id="jdk9.jtreg.tests">
317 <      <include name="**/*.java"/>
318 <    </patternset>
319 <  </fileset>
320 <
321 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
309 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
310 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
311 >  <property name="jtreg.test.pattern" value="**/*.java"/>
312 >  <macrodef name="defjtregtests">
313 >    <attribute name="v"/>
314 >    <sequential>
315 >      <fileset dir="${jtreg@{v}.src.dir}">
316 >        <patternset id="jdk@{v}.jtreg.tests">
317 >          <include name="${jtreg.test.pattern}"/>
318 >        </patternset>
319 >      </fileset>
320 >    </sequential>
321 >  </macrodef>
322  
323 <  <fileset dir="${jtreg7.src.dir}">
324 <    <patternset id="jdk7.jtreg.tests">
325 <      <include name="**/*.java"/>
326 <    </patternset>
327 <  </fileset>
323 >  <defjtregtests v="11"/>
324 >  <defjtregtests v="10"/>
325 >  <defjtregtests v="9"/>
326 >  <defjtregtests v="8"/>
327 >  <defjtregtests v="7"/>
328  
329    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
330    <property name="jtreg.flags" value=""/>
# Line 328 | Line 334
334      <attribute name="target"/>
335      <attribute name="workdir"/>
336      <attribute name="classes"/>
337 +    <attribute name="verbose" default="${jtreg.verbose}"/>
338      <attribute name="jtregflags" default=""/>
339 +    <element name="jtreg-elements" optional="true"/>
340  
341      <sequential>
342  
# Line 346 | Line 354
354             workDir="@{workdir}/JTwork">
355        <patternset refid="jdk@{target}.jtreg.tests"/>
356        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
357 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
358 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
357 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
358 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359        <arg value="-agentvm"/>
360        <arg value="-noreport"/>
361 <      <arg value="-verbose:${jtreg.verbose}"/>
361 >      <arg value="-verbose:@{verbose}"/>
362        <arg value="-vmoptions:-esa -ea"/>
363        <arg value="-automatic"/>
364        <arg value="-k:!ignore"/>
365        <arg line="@{jtregflags}"/>
366        <arg line="${jtreg.flags}"/>
367 +      <jtreg-elements/>
368      </jtreg>
369      </sequential>
370    </macrodef>
# Line 372 | Line 381
381    <!-- Main targets -->
382  
383    <property name="build.main.java.version" value="9"/>
384 <  <property name="build.main.javac" value="${javac9}"/>
384 >  <!-- Workaround "no nested properties in ant" -->
385 >  <macrodef name="define-build-main-properties">
386 >    <attribute name="v"/>
387 >    <sequential>
388 >      <property name="build.main.java"    value="${java@{v}}"/>
389 >      <property name="build.main.javac"   value="${javac@{v}}"/>
390 >      <!-- Force javadoc version to be at least 10,
391 >           so we can use override-methods=summary -->
392 >      <condition property="build.main.javadoc"
393 >                 value="${javadoc10}"
394 >                 else="${javadoc@{v}}">
395 >        <equals arg1="@{v}" arg2="9"/>
396 >      </condition>
397 >    </sequential>
398 >  </macrodef>
399 >  <define-build-main-properties v="${build.main.java.version}"/>
400  
401    <target name="dists"
402            depends="dist, 4jdk8dist"
# Line 385 | Line 409
409            depends="configure-compiler"
410            description="Compiles src/main sources to build dir">
411  
388 –    <local name="modules"/>
389 –    <condition property="modules">
390 –      <and>
391 –        <available file="${jdk9.home}/jmods" type="dir"/>
392 –        <equals arg1="9" arg2="${build.main.java.version}"/>
393 –      </and>
394 –    </condition>
395 –
412      <local name="destdir"/>
413 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
398 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
413 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
414  
415      <mkdir dir="${destdir}"/>
416  
# Line 412 | Line 427
427             fork="true">
428  
429        <include name="**/*.java"/>
430 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
430 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
431        <compilerarg value="-Xprefer:source"/>
432        <compilerarg value="-XDignore.symbol.file=true"/>
433        <compilerarg value="-Xlint:all"/>
# Line 463 | Line 478
478               sourcepath="${src.dir}"
479               classpath=""
480               source="9"
481 <             executable="${javadoc9}">
481 >             executable="${build.main.javadoc}">
482        <fileset dir="${src.dir}" defaultexcludes="yes">
483          <include name="**/*.java"/>
484        </fileset>
# Line 472 | Line 487
487        <arg value="-XDignore.symbol.file=true"/>
488        <arg value="-html5"/>
489        <arg value="--patch-module=java.base=${src.dir}"/>
490 <      <arg value="-tag"/>
491 <      <arg value="${javadoc.jls.option}"/>
492 < <!-- @apiNote currently unused -->
493 < <!--       <arg value="-tag"/> -->
494 < <!--       <arg value="apiNote:a:API Note:"/> -->
495 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
490 >      <arg value="--override-methods=summary"/>
491 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494 > <!-- @apiNote tag currently unused -->
495 > <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
496   <!-- tags added in jdk9: currently unused -->
497 < <!--       <arg value="-tag"/> -->
498 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
497 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499      </javadoc>
500    </target>
501  
# Line 597 | Line 607
607  
608   <!--   </target> -->
609  
610 < <!--   <target name="test89" -->
611 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
610 >  <target name="test91011"
611 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
612  
613 < <!--     <antcall target="clean"/> -->
614 < <!--     <antcall target="test"> -->
615 < <!--       <param name="build.main.java.version" value="8"/> -->
616 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
613 >    <antcall target="clean"/>
614 >    <antcall target="test">
615 >      <param name="build.main.java.version" value="9"/>
616 >    </antcall>
617  
618 < <!--     <antcall target="clean"/> -->
619 < <!--     <antcall target="test"> -->
620 < <!--       <param name="build.main.java.version" value="9"/> -->
621 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
613 < <!--     </antcall> -->
618 >    <antcall target="clean"/>
619 >    <antcall target="test">
620 >      <param name="build.main.java.version" value="10"/>
621 >    </antcall>
622  
623 < <!--   </target> -->
623 >    <antcall target="clean"/>
624 >    <antcall target="test">
625 >      <param name="build.main.java.version" value="11"/>
626 >    </antcall>
627 >
628 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
629 >    <antcall target="clean"/>
630 >
631 >  </target>
632  
633  
634  
# Line 680 | Line 696
696             includeAntRuntime="false"
697             includeJavaRuntime="false"
698             encoding="ASCII"
699 <           executable="${javac9}"
699 >           executable="${build.main.javac}"
700             fork="true">
701  
702        <include name="*.java"/>
# Line 821 | Line 837
837        </fileset>
838        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
839        <arg value="-XDignore.symbol.file=true"/>
840 <      <arg value="-tag"/>
841 <      <arg value="${javadoc.jls.option}"/>
842 < <!-- @apiNote currently unused -->
843 < <!--       <arg value="-tag"/> -->
844 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
829 <      <arg value="-tag"/>
830 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
831 <      <arg value="-tag"/>
832 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843 > <!-- @apiNote tag currently unused -->
844 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845      </javadoc>
846    </target>
847  
# Line 1375 | Line 1387
1387  
1388   <!-- ==============================================================
1389    Experimental errorprone support - http://errorprone.info
1378 –  You may need to bring your own errorprone jar.
1390   =================================================================== -->
1391 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1392 +  <property name="errorprone.jsr166.user.flags" value=""/>
1393 +  <property name="errorprone.jsr166.flags"
1394 +            value="-Xep:HashtableContains:OFF
1395 +                   -Xep:JdkObsolete:OFF
1396 +                   -Xep:MissingOverride:OFF
1397 +                   -Xep:MissingFail:OFF
1398 +                   -Xep:MixedArrayDimensions:ERROR
1399 +                   -Xep:RemoveUnusedImports:ERROR
1400 +                   -Xep:EmptyIf:ERROR
1401 +                   -Xep:MultipleTopLevelClasses:ERROR
1402 +                   -Xep:ClassName:ERROR
1403 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1404 +                   -Xep:RedundantThrows:ERROR
1405 +                   -Xep:IdentityBinaryExpression:WARN
1406 +                   -Xep:MethodCanBeStatic:WARN
1407 +                   ${errorprone.jsr166.user.flags}"/>
1408 +  <!-- -Xep:WildcardImport:ERROR -->
1409 +  <property name="errorprone.jsr166.test.flags"
1410 +            value="-Xep:StringSplitter:OFF
1411 +                   -Xep:BoxedPrimitiveConstructor:OFF
1412 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1413 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1414    <target name="errorprone"
1415            depends="clean, configure-compiler"
1416            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1432
1432             fork="true">
1433  
1434        <include name="**/*.java"/>
1435 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1436 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1403 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1404 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1405 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1435 >      <compilerarg value="-XDcompilePolicy=simple"/>
1436 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1437        <compilerarg value="-Xplugin:ErrorProne
1438 <                          -Xep:IdentityBinaryExpression:WARN
1413 <                          -Xep:MissingOverride:OFF
1414 <                          -Xep:MixedArrayDimensions:WARN
1415 <                          -Xep:RemoveUnusedImports:ERROR
1416 <                          -Xep:ClassName:ERROR
1417 <                          -Xep:MultipleTopLevelClasses:ERROR
1418 <                          -Xep:EmptyIf:ERROR
1419 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 <                          -Xep:ArgumentParameterSwap:ERROR
1421 <                          -Xep:RedundantThrows:ERROR
1422 <                          -Xep:MethodCanBeStatic:WARN"/>
1438 >                          ${errorprone.jsr166.flags}"/>
1439        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1440        <compilerarg value="-Xprefer:source"/>
1441        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1438 | Line 1454
1454        workdir="${build.dir}"
1455        classes="${product.jar}">
1456        <javac-elements>
1457 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1458 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1443 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1444 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1457 >        <compilerarg value="-XDcompilePolicy=simple"/>
1458 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1459          <compilerarg value="-Xplugin:ErrorProne
1460 <                            -Xep:IdentityBinaryExpression:WARN
1461 <                            -Xep:BoxedPrimitiveConstructor:OFF
1454 <                            -Xep:HashtableContains:OFF
1455 <                            -Xep:ModifyingCollectionWithItself:OFF
1456 <                            -Xep:MissingOverride:OFF
1457 <                            -Xep:MixedArrayDimensions:WARN
1458 <                            -Xep:RemoveUnusedImports:ERROR
1459 <                            -Xep:ClassName:ERROR
1460 <                            -Xep:MultipleTopLevelClasses:ERROR
1461 <                            -Xep:EmptyIf:ERROR
1462 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 <                            -Xep:ArgumentParameterSwap:ERROR
1464 <                            -Xep:RedundantThrows:ERROR
1465 <                            -Xep:MethodCanBeStatic:WARN"/>
1460 >                            ${errorprone.jsr166.flags}
1461 >                            ${errorprone.jsr166.test.flags}"/>
1462          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1463        </javac-elements>
1464      </run-tck-tests>
1465    </target>
1466  
1467 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1468 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1469 +  <target name="errorprone-jtreg"
1470 +          depends="jar"
1471 +          description="Run errorprone over jtreg tests (experimental)">
1472 +
1473 +    <run-jtreg-tests
1474 +       target="${build.main.java.version}"
1475 +       workdir="${build.dir}"
1476 +       classes="${product.jar}"
1477 +       verbose="all">
1478 +      <jtreg-elements>
1479 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1480 +        <arg value="-javacoption:-processorpath"/>
1481 +        <arg value="-javacoption:${errorprone.jar}"/>
1482 +        <arg value="-javacoption:-Xplugin:ErrorProne
1483 +                            ${errorprone.jsr166.flags}
1484 +                            ${errorprone.jsr166.test.flags}
1485 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1486 +      </jtreg-elements>
1487 +    </run-jtreg-tests>
1488 +  </target>
1489 +
1490  
1491   <!-- ==============================================================
1492    Running guava tests against jsr166 code
# Line 1521 | Line 1540
1540      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1541           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1542      <junit printsummary="true" showoutput="true" haltonfailure="true"
1543 <           jvm="${java9}" fork="true">
1544 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1543 >           jvm="${build.main.java}" fork="true">
1544 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1545        <formatter type="brief"/>
1546        <classpath>
1547          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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