--- jsr166/build.xml	2018/07/18 01:16:42	1.275
+++ jsr166/build.xml	2018/10/24 22:31:14	1.283
@@ -197,12 +197,15 @@
   <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
   <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
+  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
   <!-- The location of jdk early access docs (RIP) -->
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
   <!-- <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="http://download.java.net/java/jdk12/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}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
@@ -388,19 +391,19 @@
 
   <!-- Main targets -->
 
-  <property name="build.main.java.version" value="9"/>
+  <property name="build.main.java.version" value="11"/>
   <!-- Workaround "no nested properties in ant" -->
   <macrodef name="define-build-main-properties">
     <attribute name="v"/>
     <sequential>
       <property name="build.main.java"    value="${java@{v}}"/>
       <property name="build.main.javac"   value="${javac@{v}}"/>
-      <!-- Force javadoc version to be at least 10, 
-           so we can use override-methods=summary -->
+      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
+      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
       <condition property="build.main.javadoc" 
-                 value="${javadoc11}"
+                 value="${javadoc12}"
                  else="${javadoc@{v}}">
-        <equals arg1="@{v}" arg2="9"/>
+        <matches pattern="^(9|10|11)$" string="@{v}"/>
       </condition>
     </sequential>
   </macrodef>
@@ -409,9 +412,7 @@
   <target name="dists"
           depends="dist, 4jdk8dist"
           description="Builds all public jars and docs"/>
-          <!--
-              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
-          -->
+          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
 
   <target name="compile"
           depends="configure-compiler"
@@ -480,21 +481,22 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java9.api.url}"
+             link="${java11.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             source="9"
+             source="11"
              executable="${build.main.javadoc}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-html5"/>
       <arg value="--patch-module=java.base=${src.dir}"/>
+      <arg value="--frames"/>
       <arg value="--override-methods=summary"/>
       <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
       <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
@@ -512,28 +514,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-  <target name="release"
-          depends="dist"
-          description="Puts entire CVS tree, plus distribution productions, in a jar">
-
-    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
-
-    <jar basedir="${basedir}" destfile="${release.jar}">
-      <!-- <exclude name="build/**"/> -->
-      <exclude name="${release.jar}"/>
-      <exclude name="user.properties"/>
-      <exclude name="etc/notes/**"/>
-      <exclude name="src/emulation/**"/>
-      <exclude name="**/SyntaxTest.java"/>
-      <exclude name="**/SuperfluousAbstract.java"/>
-      <manifest>
-        <attribute name="Built-By" value="${user.name}"/>
-        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
-      </manifest>
-    </jar>
-  </target>
-
-
   <target name="clean"
           description="Removes all build products">
     <delete dir="${build.dir}"/>
@@ -620,21 +600,35 @@
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="9"/>
+      <param name="build.main.java" value="${java9}"/>
+      <param name="build.main.javac" value="${javac9}"/>
     </antcall>
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="10"/>
+      <param name="build.main.java" value="${java10}"/>
+      <param name="build.main.javac" value="${javac10}"/>
     </antcall>
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="11"/>
+      <param name="build.main.java" value="${java11}"/>
+      <param name="build.main.javac" value="${javac11}"/>
     </antcall>
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="12"/>
+      <param name="build.main.java" value="${java12}"/>
+      <param name="build.main.javac" value="${javac12}"/>
+    </antcall>
+    <antcall target="docs">
+      <param name="build.main.java.version" value="12"/>
+      <param name="build.main.java" value="${java12}"/>
+      <param name="build.main.javac" value="${javac12}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
     </antcall>
 
     <!-- Clean up to avoid obscure wrong class file version bugs -->
@@ -1398,7 +1392,7 @@
 
 
 <!-- ==============================================================
-  Experimental errorprone support - http://errorprone.info
+  Experimental errorprone support - https://errorprone.info
 =================================================================== -->
   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
   <property name="errorprone.jsr166.user.flags" value=""/>