Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1205266)
+++ lucene/common-build.xml	(working copy)
@@ -879,6 +879,18 @@
               <containsregexp expression="\[javadoc\]\s*warning.*bootstrap"/>
               <containsregexp expression="\[javadoc\]\s*1\s*warning"/>
             </and>
+            <and>
+              <!-- allow 1 warning, if there is an error fetching javadoc package-list from Oracle. -->
+              <containsregexp expression="\[javadoc\].*warning.*Error\s+fetching\s+URL:.*package-list"/>
+              <containsregexp expression="\[javadoc\]\s*1\s*warning"/>
+            </and>
+            <and>
+              <!-- allow 2 warnings, if there is also a bootstrap warning generated by Java7 -->
+              <!-- and there is an error fetching javadoc package-list from Oracle. -->
+              <containsregexp expression="\[javadoc\]\s*warning.*bootstrap"/>
+              <containsregexp expression="\[javadoc\][^\s\r]*warning[^\s\r]*Error\s+fetching\s+URL:[^\s\r]*package-list"/>
+              <containsregexp expression="\[javadoc\]\s*2\s*warnings"/>
+            </and>
           </or>
         </fileset>
       </delete>