From b29b731a2c5f34b21f54565ca60a64e7e7af7648 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Thu, 12 Dec 2019 19:25:22 +0100
Subject: [PATCH] Correct regexes normalizing jar filenames so that the
 resulting licenses are consistent with gradle (which will use proper artifact
 name, not a chain of regexes).

---
 lucene/build.xml                                                | 2 +-
 lucene/tools/custom-tasks.xml                                   | 2 +-
 solr/build.xml                                                  | 2 +-
 .../{log4j-LICENSE-ASL.txt => log4j-1.2-api-LICENSE-ASL.txt}    | 0
 solr/licenses/{log4j-NOTICE.txt => log4j-1.2-api-NOTICE.txt}    | 0
 ...ics-jetty-LICENSE-ASL.txt => metrics-jetty9-LICENSE-ASL.txt} | 0
 .../{metrics-jetty-NOTICE.txt => metrics-jetty9-NOTICE.txt}     | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename solr/licenses/{log4j-LICENSE-ASL.txt => log4j-1.2-api-LICENSE-ASL.txt} (100%)
 rename solr/licenses/{log4j-NOTICE.txt => log4j-1.2-api-NOTICE.txt} (100%)
 rename solr/licenses/{metrics-jetty-LICENSE-ASL.txt => metrics-jetty9-LICENSE-ASL.txt} (100%)
 rename solr/licenses/{metrics-jetty-NOTICE.txt => metrics-jetty9-NOTICE.txt} (100%)

diff --git a/lucene/build.xml b/lucene/build.xml
index d4eb59e6bde..322d2d27eba 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -89,7 +89,7 @@
     <property name="skipRegexChecksum" value=""/>
     <license-check-macro dir="${basedir}" licensedir="${common.dir}/licenses">
       <additional-filters>
-        <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
+        <replaceregex pattern="^jetty([^/]+)$" replace="jetty" flags="gi" />
         <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
         <replaceregex pattern="javax\.servlet([^/]+)$" replace="javax.servlet" flags="gi" />
         <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
diff --git a/lucene/tools/custom-tasks.xml b/lucene/tools/custom-tasks.xml
index 11bb4530331..4b5c3ea8ce2 100644
--- a/lucene/tools/custom-tasks.xml
+++ b/lucene/tools/custom-tasks.xml
@@ -43,7 +43,7 @@
 
     <!-- Typical version patterns. -->
     <replaceregex pattern="\.rc[0-9]+" replace="" flags="gi" />
-    <replaceregex pattern="\-(r)?([0-9\-\_\.])+(([a-zA-Z]+)([0-9\-\.])*)?" replace="" flags="gi" />
+    <replaceregex pattern="(?&lt;!log4j)\-(r)?([0-9\-\_\.])+(([a-zA-Z]+)([0-9\-\.])*)?" replace="" flags="gi" />
     
     <replaceregex pattern="[-]tests$" replace="-tests" flags="gi" />
 
diff --git a/solr/build.xml b/solr/build.xml
index ef597603faa..b57fe998ef2 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -333,7 +333,7 @@
         <exclude name="package/**"/>
       </additional-excludes>
       <additional-filters>
-        <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
+        <replaceregex pattern="^jetty([^/]+)$" replace="jetty" flags="gi" />
         <!-- start.jar comes from jetty, .jar already stripped by checker defaults --> 
         <replaceregex pattern="^start$" replace="jetty" flags="gi" />
         <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
diff --git a/solr/licenses/log4j-LICENSE-ASL.txt b/solr/licenses/log4j-1.2-api-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/log4j-LICENSE-ASL.txt
rename to solr/licenses/log4j-1.2-api-LICENSE-ASL.txt
diff --git a/solr/licenses/log4j-NOTICE.txt b/solr/licenses/log4j-1.2-api-NOTICE.txt
similarity index 100%
rename from solr/licenses/log4j-NOTICE.txt
rename to solr/licenses/log4j-1.2-api-NOTICE.txt
diff --git a/solr/licenses/metrics-jetty-LICENSE-ASL.txt b/solr/licenses/metrics-jetty9-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/metrics-jetty-LICENSE-ASL.txt
rename to solr/licenses/metrics-jetty9-LICENSE-ASL.txt
diff --git a/solr/licenses/metrics-jetty-NOTICE.txt b/solr/licenses/metrics-jetty9-NOTICE.txt
similarity index 100%
rename from solr/licenses/metrics-jetty-NOTICE.txt
rename to solr/licenses/metrics-jetty9-NOTICE.txt