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 2012/07/12 00:34:40 UTC
svn commit: r1360451 - in /lucene/dev/trunk: lucene/build.xml
lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
solr/build.xml
Author: uschindler
Date: Wed Jul 11 22:34:39 2012
New Revision: 1360451
URL: http://svn.apache.org/viewvc?rev=1360451&view=rev
Log:
LUCENE-4199, LUCENE-4202, LUCENE-4206: Remove noise by not-existing XML CDATA in task; cleanup build.xmls
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
lucene/dev/trunk/solr/build.xml
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1360451&r1=1360450&r2=1360451&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Wed Jul 11 22:34:39 2012
@@ -189,11 +189,8 @@
</target>
<target name="-check-forbidden-test-apis">
- <forbidden-apis>
+ <forbidden-apis apiFile="${custom-tasks.dir}/forbiddenApis/tests.txt">
<classpath refid="junit-path"/>
- <apiFileSet dir="${custom-tasks.dir}/forbiddenApis">
- <include name="tests.txt" />
- </apiFileSet>
<fileset dir="${basedir}/build" includes="**/classes/test/**/*.class,test-framework/**/*.class" />
</forbidden-apis>
</target>
Modified: lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java?rev=1360451&r1=1360450&r2=1360451&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java (original)
+++ lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java Wed Jul 11 22:34:39 2012
@@ -343,8 +343,11 @@ public class ForbiddenApisCheckTask exte
throw new BuildException("Resource does not exist: " + r);
}
if (r instanceof StringResource) {
- log("Reading inline API signatures...", Project.MSG_INFO);
- parseApiFile(new StringReader(((StringResource) r).getValue()));
+ final String s = ((StringResource) r).getValue();
+ if (s != null && s.trim().length() > 0) {
+ log("Reading inline API signatures...", Project.MSG_INFO);
+ parseApiFile(new StringReader(s));
+ }
} else {
log("Reading API signatures: " + r, Project.MSG_INFO);
parseApiFile(new InputStreamReader(r.getInputStream(), "UTF-8"));
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1360451&r1=1360450&r2=1360451&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Wed Jul 11 22:34:39 2012
@@ -210,11 +210,8 @@
</target>
<target name="-check-forbidden-test-apis">
- <forbidden-apis>
+ <forbidden-apis apiFile="${custom-tasks.dir}/forbiddenApis/tests.txt">
<classpath refid="junit-path"/>
- <apiFileSet dir="${custom-tasks.dir}/forbiddenApis">
- <include name="tests.txt" />
- </apiFileSet>
<fileset dir="${basedir}/build">
<include name="**/classes/test/**/*.class"/>
<include name="solr-test-framework/**/*.class"/>