You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/07/24 22:16:15 UTC
svn commit: r1150480 - /lucene/dev/trunk/lucene/common-build.xml
Author: uschindler
Date: Sun Jul 24 20:16:15 2011
New Revision: 1150480
URL: http://svn.apache.org/viewvc?rev=1150480&view=rev
Log:
Allow the bootstrap warning in javadoc with Java 7
Modified:
lucene/dev/trunk/lucene/common-build.xml
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1150480&r1=1150479&r2=1150480&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sun Jul 24 20:16:15 2011
@@ -838,9 +838,16 @@
<delete>
<fileset file="@{destdir}/log_javadoc.txt">
- <not>
- <containsregexp expression="\[javadoc\]\s*[1-9][0-9]*[\s]*warning"/>
- </not>
+ <or>
+ <not>
+ <containsregexp expression="\[javadoc\]\s*[1-9][0-9]*\s*warning"/>
+ </not>
+ <and>
+ <!-- allow 1 warning, if there is also a bootstrap warning generated by Java7 -->
+ <containsregexp expression="\[javadoc\]\s*warning.*bootstrap"/>
+ <containsregexp expression="\[javadoc\]\s*1\s*warning"/>
+ </and>
+ </or>
</fileset>
</delete>