You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2023/01/12 15:45:50 UTC
[asterixdb] 02/08: Merge branch 'gerrit/mad-hatter'
This is an automated email from the ASF dual-hosted git repository.
mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 023e28c15d6d856419d7c595105818a76d3e3511
Merge: 4af9e73bb6 d7e54cf144
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Nov 20 21:41:37 2022 -0500
Merge branch 'gerrit/mad-hatter'
Change-Id: I300a5e2910bde9e7bcd5f187efca26e4c7689ffb
.../main/licenses/templates/asterix-license.ftl | 3 +
.../src/main/licenses/templates/asterix-notice.ftl | 3 +
.../src/main/licenses/templates/hyracks-notice.ftl | 3 +
.../maven/license/DownloadLicensesMojo.java | 2 +-
.../hyracks/maven/license/GenerateFileMojo.java | 120 ++++++++++++++++++---
.../apache/hyracks/maven/license/LicenseMojo.java | 47 +++++---
.../hyracks/maven/license/project/Project.java | 12 ++-
7 files changed, 159 insertions(+), 31 deletions(-)
diff --cc hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 6bc92b8539,b3a0bb299c..6d30a691fb
--- 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,19 -357,17 +357,19 @@@ public class GenerateFileMojo extends L
}
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);
+ getNoticeFileContentTransformer(), !validateShadowLicenses);
}
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());
+ UnaryOperator.identity(), !validateShadowLicenses);
}
private void resolveArtifactFiles(final String name, final ProjectFlag ignoreFlag,