--- jsr166/build.xml	2017/09/19 22:41:18	1.252
+++ jsr166/build.xml	2017/09/25 22:54:09	1.254
@@ -181,15 +181,15 @@
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
-  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
-  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
-  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-  <!-- The expected canonical location does not yet exist as of 2016-04 -->
-  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
+  <property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
+  <property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
+  <property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
+  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
+  <!-- The location of jdk9 early access docs -->
+  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
+  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -1377,6 +1377,7 @@
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
 =================================================================== -->
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1398,7 +1399,7 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
+      <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
                           -Xep:IdentityBinaryExpression:WARN
                           -Xep:MissingOverride:OFF
@@ -1428,7 +1429,7 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
-        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
+        <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
                             -Xep:IdentityBinaryExpression:WARN
                             -Xep:BoxedPrimitiveConstructor:OFF