>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17291 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Merge branch 'gerrit/mad-hatter'
Change-Id: I300a5e2910bde9e7bcd5f187efca26e4c7689ffb
---
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
2 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
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 c9b2721..6d30a69 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
@@ -360,26 +360,16 @@
// 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,
-<<<<<<< HEAD (4af9e7 Merge branch 'gerrit/mad-hatter')
entry -> entry.getName().matches("(.*/|^)" + "NOTICE" +
"(.(txt|md))?"), Project::setNoticeText,
- text -> stripFoundationAssertionFromNotices ?
FOUNDATION_PATTERN.matcher(text).replaceAll("") : text);
-=======
- entry -> entry.getName().matches("(.*/|^)" + "NOTICE" +
"(.txt)?"), Project::setNoticeText,
getNoticeFileContentTransformer(), !validateShadowLicenses);
->>>>>>> BRANCH (d7e54c [NO ISSUE] Process shadowed projects w/ license plugin)
}
private void resolveLicenseFiles() throws MojoExecutionException,
IOException {
// 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,
-<<<<<<< HEAD (4af9e7 Merge branch 'gerrit/mad-hatter')
entry -> entry.getName().matches("(.*/|^)" + "LICENSE" +
"(.(txt|md))?"), Project::setLicenseText,
- UnaryOperator.identity());
-=======
- entry -> entry.getName().matches("(.*/|^)" + "LICENSE" +
"(.txt)?"), Project::setLicenseText,
UnaryOperator.identity(), !validateShadowLicenses);
->>>>>>> BRANCH (d7e54c [NO ISSUE] Process shadowed projects w/ license plugin)
}
private void resolveArtifactFiles(final String name, final ProjectFlag
ignoreFlag,
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17291
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I300a5e2910bde9e7bcd5f187efca26e4c7689ffb
Gerrit-Change-Number: 17291
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
Gerrit-MessageType: merged
