svn commit: r1695670 - in /lucene/dev/branches/branch_5x: ./ build.xml lucene/ lucene/LICENSE.txt

[us...@apache.org]

Author: uschindler
Date: Thu Aug 13 09:55:38 2015
New Revision: 1695670

URL: http://svn.apache.org/r1695670
Log:
Merged revision(s) 1695669 from lucene/dev/trunk:
LUCENE-6732: Scan txt files in root folder, too. TODO: scan txt files everywhere

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/build.xml
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/LICENSE.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_5x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/build.xml?rev=1695670&r1=1695669&r2=1695670&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/build.xml (original)
+++ lucene/dev/branches/branch_5x/build.xml Thu Aug 13 09:55:38 2015
@@ -136,7 +136,7 @@
       def extensions = [
         'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html', 'js',
         'css', 'xml', 'xsl', 'vm', 'sh', 'cmd', 'bat', 'policy',
-        'properties',
+        'properties', 'mdtext',
       ];
       def invalidPatterns = [
         (~$/@author\b/$) : '@author javadoc tag',
@@ -175,7 +175,13 @@
             include(name: 'dev-tools/**/*.' + it)
             include(name: '*.' + it)
           }
+          // TODO: For now we don't scan txt files, so we
+          // check licenses in top-level folders separately:
+          include(name: '*.txt')
+          include(name: '*/*.txt')
+          // excludes:
           exclude(name: '**/build/**')
+          exclude(name: '**/dist/**')
           exclude(name: 'build.xml') // ourselves :-)
         }
       }.each{ f ->

Modified: lucene/dev/branches/branch_5x/lucene/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/LICENSE.txt?rev=1695670&r1=1695669&r2=1695670&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/LICENSE.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/LICENSE.txt Thu Aug 13 09:55:38 2015
@@ -446,7 +446,7 @@ BSD-licensed dictionary of Polish (SGJP)
 http://sgjp.pl/morfeusz/
 
 Copyright © 2011 Zygmunt Saloni, Włodzimierz Gruszczyński, 
-	    	 Marcin Woliński, Robert Wołosz
+Marcin Woliński, Robert Wołosz
 
 All rights reserved.