--- jsr166/build.xml	2018/12/02 22:40:03	1.289
+++ jsr166/build.xml	2018/12/31 07:05:54	1.294
@@ -24,18 +24,20 @@
   $HOME/jdk/jdk10
   $HOME/jdk/jdk11
   $HOME/jdk/jdk12
+  $HOME/jdk/jdk13
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9
   $HOME/jdk/src/jdk10
   $HOME/jdk/src/jdk11
   $HOME/jdk/src/jdk12
+  $HOME/jdk/src/jdk13
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
   Alternatively, define ant variables thus:
   ant -Djdk$N.home=... -Djdk$N.src.home=...
-  for $N in 8 9 10 ...
+  for $N in 8 .. 13 ...
 
   As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
@@ -138,6 +140,7 @@
   <defjdklocations v="10"/>
   <defjdklocations v="11"/>
   <defjdklocations v="12"/>
+  <defjdklocations v="13"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -150,6 +153,7 @@
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -202,10 +206,9 @@
   <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
   <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
-  <!-- Default jdk doc location (latest stable release seems best) -->
-  <!-- But pin to jdk 10 until fix for -->
-  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
-  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
+  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
+  <!-- Default jdk doc location (latest stable LTS release seems best) -->
+  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -216,6 +219,7 @@
   <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
   <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
   <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
+  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -329,6 +333,7 @@
     </sequential>
   </macrodef>
 
+  <defjtregtests v="13"/>
   <defjtregtests v="12"/>
   <defjtregtests v="11"/>
   <defjtregtests v="10"/>
@@ -340,7 +345,7 @@
   <property name="jtreg.flags" value=""/>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
+    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
@@ -393,11 +398,17 @@
   <!-- Default values: may seem strange ... -->
   <!-- At runtime, target latest LTS, i.e. jdk11 -->
   <!-- But at build time, target jdk9, for maximal binary portability -->
-  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
-  <property name="build.main.java.version" value="11"/>
+  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
+    o override-methods=summary
+    o {@systemProperty ...}
+    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
+    o 8202628: javadoc generates bad links in TestModules.java
+    -->
+  <property name="java.runtime.target" value="11"/>
   <property name="build.main.java" value="${java11}"/>
   <property name="build.main.javac" value="${javac9}"/>
   <property name="build.main.javadoc" value="${javadoc12}"/>
+  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
 
   <target name="dists"
           depends="dist, 4jdk8dist"
@@ -471,17 +482,18 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java11.api.url}"
+             link="${java.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             source="11"
+             source="${build.main.javadoc.source}"
              executable="${build.main.javadoc}">
+<!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-html5"/>
@@ -533,7 +545,7 @@
           description="Runs tck tests for src/main directly">
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
@@ -567,7 +579,7 @@
 	  depends="jar"
           description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"/>
   </target>
@@ -577,26 +589,28 @@
           description="Runs tck and jtreg tests for src/main"/>
 
   <target name="test-version-permutations"
-	  depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
+	  depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
   </target>
 
   <target name="test9">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="9"/>
-      <param name="build.main.java" value="${java9}"/>
+      <param name="java.runtime.target" value="9"/>
       <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
       <target name="test"/>
+      <target name="docs"/>
     </antcall>
   </target>
 
   <target name="test10">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="10"/>
-      <param name="build.main.java" value="${java10}"/>
+      <param name="java.runtime.target" value="10"/>
       <param name="build.main.javac" value="${javac10}"/>
-      <param name="build.main.javadoc" value="${javadoc10}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="10"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -605,10 +619,10 @@
   <target name="test11">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="11"/>
-      <param name="build.main.java" value="${java11}"/>
+      <param name="java.runtime.target" value="11"/>
       <param name="build.main.javac" value="${javac11}"/>
-      <param name="build.main.javadoc" value="${javadoc11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -617,10 +631,22 @@
   <target name="test12">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="12"/>
-      <param name="build.main.java" value="${java12}"/>
+      <param name="java.runtime.target" value="12"/>
       <param name="build.main.javac" value="${javac12}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="12"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
+
+  <target name="test13">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac13}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="13"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -629,10 +655,10 @@
   <target name="test9-11">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="11"/>
-      <param name="build.main.java" value="${java11}"/>
+      <param name="java.runtime.target" value="11"/>
       <param name="build.main.javac" value="${javac9}"/>
-      <param name="build.main.javadoc" value="${javadoc11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -641,10 +667,22 @@
   <target name="test9-12">
     <antcall target="clean"/>
     <antcall>
-      <param name="build.main.java.version" value="12"/>
-      <param name="build.main.java" value="${java12}"/>
+      <param name="java.runtime.target" value="12"/>
       <param name="build.main.javac" value="${javac9}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
+
+  <target name="test9-13">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="9"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -1452,7 +1490,7 @@
     </jar>
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
@@ -1475,7 +1513,7 @@
           description="Run errorprone over jtreg tests (experimental)">
 
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"
        verbose="all">