You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ht...@apache.org on 2020/10/16 05:38:28 UTC
[asterixdb] branch master updated: [ASTERIXDB-2787][TEST] Support
.md extension for LICENSE and NOTICE
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 7330f66 [ASTERIXDB-2787][TEST] Support .md extension for LICENSE and NOTICE
7330f66 is described below
commit 7330f6612a8ea3ebee88627b1cc5dd396a05a45f
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Fri Oct 16 06:54:35 2020 +0300
[ASTERIXDB-2787][TEST] Support .md extension for LICENSE and NOTICE
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Currently, only LICENSE (no extension) and LICENSE.txt
are supported for LICENSE and NOTICE files. This adds
support to .md extension as well (LICENSE.md).
Change-Id: Ie29e061176964ccb85df34ccc17843177b58d838
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8444
Reviewed-by: Michael Blow <mb...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Hussain Towaileb <hu...@gmail.com>
---
.../org/apache/hyracks/maven/license/GenerateFileMojo.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index e69887c..6bc92b8 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@ -335,16 +335,18 @@ public class GenerateFileMojo extends LicenseMojo {
}
private void resolveNoticeFiles() throws MojoExecutionException, IOException {
- // TODO(mblow): this will match *any* NOTICE[.txt] file located within the artifact- this seems way too liberal
+ // TODO(mblow): this will match *any* NOTICE[.(txt|md)] file located within the artifact-
+ // this seems way too liberal
resolveArtifactFiles("NOTICE", IGNORE_MISSING_EMBEDDED_NOTICE, ALTERNATE_NOTICE_FILE,
- entry -> entry.getName().matches("(.*/|^)" + "NOTICE" + "(.txt)?"), Project::setNoticeText,
+ entry -> entry.getName().matches("(.*/|^)" + "NOTICE" + "(.(txt|md))?"), Project::setNoticeText,
text -> stripFoundationAssertionFromNotices ? FOUNDATION_PATTERN.matcher(text).replaceAll("") : text);
}
private void resolveLicenseFiles() throws MojoExecutionException, IOException {
- // TODO(mblow): this will match *any* LICENSE[.txt] file located within the artifact- this seems way too liberal
+ // TODO(mblow): this will match *any* LICENSE[.(txt|md)] file located within the artifact-
+ // this seems way too liberal
resolveArtifactFiles("LICENSE", IGNORE_MISSING_EMBEDDED_LICENSE, ALTERNATE_LICENSE_FILE,
- entry -> entry.getName().matches("(.*/|^)" + "LICENSE" + "(.txt)?"), Project::setLicenseText,
+ entry -> entry.getName().matches("(.*/|^)" + "LICENSE" + "(.(txt|md))?"), Project::setLicenseText,
UnaryOperator.identity());
}