Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1483307)
+++ lucene/common-build.xml	(working copy)
@@ -1630,8 +1630,29 @@
     </sequential>
   </macrodef>
 
-  <target name="-ecj-javadoc-lint" depends="-ecj-javadoc-lint-src,-ecj-javadoc-lint-tests"/>
+  <!-- ECJ Javadoc linting: -->
+  
+  <condition property="ecj-javadoc-lint.supported">
+    <not><equals arg1="${build.java.runtime}" arg2="1.8"/></not>
+  </condition>
 
+  <target name="-ecj-javadoc-lint-unsupported" unless="ecj-javadoc-lint.supported">
+    <fail message="Linting documentation with ECJ is not supported on this Java version (${build.java.runtime}).">
+      <condition>
+        <not><isset property="is.jenkins.build"/></not>
+      </condition>
+    </fail>
+    <echo level="warning" message="WARN: Linting documentation with ECJ is not supported on this Java version (${build.java.runtime}). NOTHING DONE!"/>
+  </target>
+
+  <target name="-ecj-javadoc-lint" depends="-ecj-javadoc-lint-unsupported" if="ecj-javadoc-lint.supported">
+    <!-- we use antcall here, otherwise ANT will run all dependent targets: -->
+    <antcall>
+      <target name="-ecj-javadoc-lint-src"/>
+      <target name="-ecj-javadoc-lint-tests"/>
+    </antcall>
+  </target>
+
   <target name="-ecj-javadoc-lint-src" depends="-ecj-resolve">
     <ecj-macro srcdir="${src.dir}" configuration="${common.dir}/tools/javadoc/ecj.javadocs.prefs">
       <classpath refid="classpath"/>