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 2013/06/28 00:37:29 UTC

svn commit: r1497595 - in /lucene/dev/trunk: lucene/common-build.xml solr/webapp/build.xml

Author: uschindler
Date: Thu Jun 27 22:37:29 2013
New Revision: 1497595

URL: http://svn.apache.org/r1497595
Log:
SOLR-4966: Fix problem with binary detection in Apache Rat by excluding the images folder

Modified:
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/solr/webapp/build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1497595&r1=1497594&r2=1497595&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Jun 27 22:37:29 2013
@@ -256,8 +256,10 @@
 
   <!-- a reasonable default exclusion set, can be overridden for special cases -->
   <property name="rat.excludes" value="**/TODO,**/*.txt,**/*.iml"/>
-  <!-- This pattern can be defined to add additional files for checks, relative to module's home dir -->
+  
+  <!-- These patterns can be defined to add additional files for checks, relative to module's home dir -->
   <property name="rat.additional-includes" value=""/>
+  <property name="rat.additional-excludes" value=""/>
 
   <propertyset id="uptodate.and.compiled.properties" dynamic="true">
     <propertyref regex=".*\.uptodate$$"/>
@@ -1511,7 +1513,7 @@ ${tests-output}/junit4-*.suites     - pe
   </target>
 
   <target name="rat-sources-typedef" unless="rat.loaded">
-    <ivy:cachepath organisation="org.apache.rat" module="apache-rat" revision="0.8" transitive="false" inline="true" conf="master" type="jar" pathid="rat.classpath"/>
+    <ivy:cachepath organisation="org.apache.rat" module="apache-rat" revision="0.9" transitive="false" inline="true" conf="master" type="jar" pathid="rat.classpath"/>
     <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
     <property name="rat.loaded" value="true"/>
   </target>
@@ -1525,7 +1527,7 @@ ${tests-output}/junit4-*.suites     - pe
     <!-- run rat, going to the file -->
     <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
                 reportFile="${rat.sources.logfile}" addDefaultLicenseMatchers="true">
-      <fileset dir="." includes="*.xml ${rat.additional-includes}"/>
+      <fileset dir="." includes="*.xml ${rat.additional-includes}" excludes="${rat.additional-excludes}"/>
       <fileset dir="${src.dir}" excludes="${rat.excludes}" erroronmissingdir="false"/>
       <fileset dir="${tests.src.dir}" excludes="${rat.excludes}" erroronmissingdir="false"/>
 

Modified: lucene/dev/trunk/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/build.xml?rev=1497595&r1=1497594&r2=1497595&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/build.xml (original)
+++ lucene/dev/trunk/solr/webapp/build.xml Thu Jun 27 22:37:29 2013
@@ -19,6 +19,7 @@
   <description>Solr webapp</description>
 
   <property name="rat.additional-includes" value="**"/>
+  <property name="rat.additional-excludes" value="web/img/**"/>
 
   <import file="../common-build.xml"/>