--- jsr166/build.xml	2017/09/19 22:41:18	1.252
+++ jsr166/build.xml	2017/10/31 17:47:57	1.258
@@ -181,15 +181,16 @@
   <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"/>
+  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
+  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
+  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
+  <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"/>
+  <!-- The location of jdk9 early access docs (RIP) -->
+  <!-- <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/"/>
@@ -328,7 +329,9 @@
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
+    <attribute name="verbose" default="${jtreg.verbose}"/>
     <attribute name="jtregflags" default=""/>
+    <element name="jtreg-elements" optional="true"/>
 
     <sequential>
 
@@ -350,12 +353,13 @@
       <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-noreport"/>
-      <arg value="-verbose:${jtreg.verbose}"/>
+      <arg value="-verbose:@{verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
       <arg line="${jtreg.flags}"/>
+      <jtreg-elements/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -1377,6 +1381,7 @@
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
 =================================================================== -->
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1398,11 +1403,11 @@
            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
-                          -Xep:MixedArrayDimensions:WARN
+                          -Xep:MixedArrayDimensions:ERROR
                           -Xep:RemoveUnusedImports:ERROR
                           -Xep:ClassName:ERROR
                           -Xep:MultipleTopLevelClasses:ERROR
@@ -1428,14 +1433,16 @@
       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
                             -Xep:HashtableContains:OFF
                             -Xep:ModifyingCollectionWithItself:OFF
                             -Xep:MissingOverride:OFF
-                            -Xep:MixedArrayDimensions:WARN
+                            -Xep:MissingFail:OFF
+                            -Xep:JdkObsolete:OFF
+                            -Xep:MixedArrayDimensions:ERROR
                             -Xep:RemoveUnusedImports:ERROR
                             -Xep:ClassName:ERROR
                             -Xep:MultipleTopLevelClasses:ERROR
@@ -1448,6 +1455,39 @@
     </run-tck-tests>
   </target>
 
+  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <target name="errorprone-jtreg"
+          depends="jar"
+          description="Run errorprone over jtreg tests (experimental)">
+
+    <run-jtreg-tests
+       target="${build.main.java.version}"
+       workdir="${build.dir}"
+       classes="${product.jar}"
+       verbose="all">
+      <jtreg-elements>
+        <arg value="-javacoption:-processorpath"/>
+        <arg value="-javacoption:${errorprone.jar}"/>
+        <arg value="-javacoption:-Xplugin:ErrorProne
+                            -Xep:IdentityBinaryExpression:WARN
+                            -Xep:BoxedPrimitiveConstructor:OFF
+                            -Xep:HashtableContains:OFF
+                            -Xep:ModifyingCollectionWithItself:OFF
+                            -Xep:MissingOverride:OFF
+                            -Xep:JdkObsolete:OFF
+                            -Xep:NonAtomicVolatileUpdate:OFF
+                            -Xep:MixedArrayDimensions:ERROR
+                            -Xep:RemoveUnusedImports:ERROR
+                            -Xep:ClassName:ERROR
+                            -Xep:MultipleTopLevelClasses:ERROR
+                            -Xep:EmptyIf:ERROR
+                            -Xep:LongLiteralLowerCaseSuffix:ERROR
+                            -Xep:RedundantThrows:ERROR
+                            -Xep:MethodCanBeStatic:WARN"/>
+      </jtreg-elements>
+    </run-jtreg-tests>
+  </target>
+
 
 <!-- ==============================================================
   Running guava tests against jsr166 code