SOLR-7469: Fix check-licenses to accurately detect if start.jar.sha1 is incorrect

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1675968 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2015-04-24 22:38:12 +00:00
parent fef21df361
commit 9fe95b08a3
3 changed files with 4 additions and 3 deletions

View File

@ -177,6 +177,7 @@ Bug Fixes
* SOLR-7387: Facet Module - distributed search didn't work when sorting terms
facet by min, max, avg, or unique functions. (yonik)
* SOLR-7469: Fix check-licenses to correctly detect if start.jar.sha1 is incorrect (hossman)
Optimizations
----------------------

View File

@ -293,14 +293,14 @@
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
<license-check-macro dir="${basedir}" licensedir="${common-solr.dir}/licenses">
<additional-excludes>
<!-- Exclude start.jar only (it'd be weird to have a license file there?) -->
<exclude name="server/start.jar" />
<exclude name="example/exampledocs/post.jar" />
<exclude name="server/solr-webapp/**" />
<exclude name="package/**"/>
</additional-excludes>
<additional-filters>
<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" />
<replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
</additional-filters>

View File

@ -1 +1 @@
24e798bde886e1430978ece6c4aa90d781e2da30
b91b72f9167cce4c1caea0f8363fd9984456e34d