svn commit: r1497406 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Thu Jun 27 15:49:37 2013
New Revision: 1497406

URL: http://svn.apache.org/r1497406
Log:
Merged revision(s) 1497405 from lucene/dev/trunk:
Improves License matching, we now disallow the Original BSD License, because it requires attribution in all advertising material

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1497406&r1=1497405&r2=1497406&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Thu Jun 27 15:49:37 2013
@@ -1527,7 +1527,7 @@ ${tests-output}/junit4-*.suites     - pe
               destdir="${java.io.tmpdir}"/>
     <!-- run rat, going to the file -->
     <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
-                reportFile="${rat.sources.logfile}">
+                reportFile="${rat.sources.logfile}" addDefaultLicenseMatchers="true">
       <fileset dir="." includes="*.xml ${rat.additional-includes}"/>
       <fileset dir="${src.dir}" excludes="${rat.excludes}" erroronmissingdir="false"/>
       <fileset dir="${tests.src.dir}" excludes="${rat.excludes}" erroronmissingdir="false"/>
@@ -1535,7 +1535,13 @@ ${tests-output}/junit4-*.suites     - pe
       <!-- TODO: Check all resource files. Currently not all stopword and similar files have no header! -->
       <fileset dir="${resources.dir}" includes="META-INF/**" erroronmissingdir="false"/>
       
-      <!-- bsd-like stuff -->
+      <!-- BSD 4-clause stuff (is disallowed below) -->
+      <rat:substringMatcher licenseFamilyCategory="BSD4 "
+             licenseFamilyName="Original BSD License (with advertising clause)">
+        <pattern substring="All advertising materials"/>
+      </rat:substringMatcher>
+
+      <!-- BSD-like stuff -->
       <rat:substringMatcher licenseFamilyCategory="BSD  "
              licenseFamilyName="Modified BSD License">
       <!-- brics automaton -->
@@ -1554,14 +1560,14 @@ ${tests-output}/junit4-*.suites     - pe
         <pattern substring="THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS"/>
       </rat:substringMatcher>
 
-      <!-- mit-like -->
+      <!-- MIT-like -->
       <rat:substringMatcher licenseFamilyCategory="MIT  "
              licenseFamilyName="The MIT License">
       <!-- ICU license -->
         <pattern substring="Permission is hereby granted, free of charge, to any person obtaining a copy"/>
       </rat:substringMatcher>
 
-      <!-- apache -->
+      <!-- Apache -->
       <rat:substringMatcher licenseFamilyCategory="AL   "
              licenseFamilyName="Apache">
         <pattern substring="Licensed to the Apache Software Foundation (ASF) under"/>
@@ -1593,7 +1599,7 @@ ${tests-output}/junit4-*.suites     - pe
         <and>
           <containsregexp expression="^0 Unknown Licenses"/>
           <not>
-            <containsregexp expression="^\s+!AL"/>
+            <containsregexp expression="^\s+!"/>
           </not>
         </and>
       </fileset>