You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/12 18:34:32 UTC
[lucene-solr] branch master updated: 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).
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new c406898 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).
c406898 is described below
commit c40689875a8dd7b5e48a99c5cbd7d79585610559
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Thu Dec 12 19:25:22 2019 +0100
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 +-
solr/licenses/{log4j-LICENSE-ASL.txt => log4j-1.2-api-LICENSE-ASL.txt} | 0
solr/licenses/{log4j-NOTICE.txt => log4j-1.2-api-NOTICE.txt} | 0
.../{metrics-jetty-LICENSE-ASL.txt => metrics-jetty9-LICENSE-ASL.txt} | 0
solr/licenses/{metrics-jetty-NOTICE.txt => metrics-jetty9-NOTICE.txt} | 0
7 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lucene/build.xml b/lucene/build.xml
index d4eb59e..322d2d2 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 11bb453..4b5c3ea 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="(?<!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 ef59760..b57fe99 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