From b4ce51b46a9bf5d0214ca1a9128c5da047ed421e Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Wed, 7 Mar 2012 23:10:30 +0000
Subject: [PATCH] SOLR-3204: fix license-check problem #2 (move solr-specific
 rules to solr)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298198 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/tools/custom-tasks.xml | 3 ---
 solr/build.xml                | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lucene/tools/custom-tasks.xml b/lucene/tools/custom-tasks.xml
index 6aa73e92ea9..a1239b0fef5 100644
--- a/lucene/tools/custom-tasks.xml
+++ b/lucene/tools/custom-tasks.xml
@@ -45,9 +45,6 @@
             <!-- Non-typical version patterns. -->
             <additional-filters />
             <replaceregex pattern="/xercesImpl([^/]+)$" replace="/xercesImpl" flags="gi" />
-            <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
-            <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
-            <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
     
             <!-- Typical version patterns. -->
             <replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
diff --git a/solr/build.xml b/solr/build.xml
index 1c14ce1ade4..0923029c02e 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -181,6 +181,9 @@
       </additional-excludes>
       <additional-filters>
         <replaceregex pattern="/jetty([^/]+)$" replace="/jetty" flags="gi" />
+        <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
+        <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
+        <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
       </additional-filters>
     </license-check-macro>
   </target>