This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 4ac0b89bc40c53a8b5ec9dfbb7382facff2b4a06 Author: Michael Blow <[email protected]> AuthorDate: Wed Jan 19 08:10:42 2022 -0500 [NO ISSUE][MISC] License plugin enhancement to aggregate overrides (partial cherry-pick of 5e44128bc13a93a3cadb12a87ecd691218481447) Change-Id: Ifc2c719a6dc840d2846d68d1b649e12bec9f22db Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14865 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15725 --- .../apache/hyracks/maven/license/LicenseMojo.java | 42 +++++++++++++--------- .../org/apache/hyracks/maven/license/Override.java | 10 ++++++ 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java index e72404cd68..89993fda0b 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java @@ -360,23 +360,31 @@ public abstract class LicenseMojo extends AbstractMojo { gatherProjectDependencies(project, dependencyLicenseMap, dependencyGavMap); for (Override override : overrides) { - String gav = override.getGav(); - MavenProject dep = dependencyGavMap.get(gav); - if (dep == null) { - getLog().warn("Unused override dependency " + gav + "; ignoring..."); - continue; - } - if (override.getUrl() != null) { - final List<Pair<String, String>> newLicense = - Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName())); - List<Pair<String, String>> prevLicense = dependencyLicenseMap.put(dep, newLicense); - warnUnlessFlag(dep, IGNORE_LICENSE_OVERRIDE, "license list for " + toGav(dep) - + " changed with <override>; was: " + prevLicense + ", now: " + newLicense); - } - if (override.getNoticeUrl() != null) { - noticeOverrides.put(gav, override.getNoticeUrl()); - warnUnlessFlag(dep, IGNORE_NOTICE_OVERRIDE, - "notice for " + toGav(dep) + " changed with <override>; now: " + override.getNoticeUrl()); + + // Collect both <gav></gav> and <gavs><gav></gav><gav></gav>...</gavs> + List<String> gavs = override.getGavs(); + if (override.getGav() != null) { + gavs.add(override.getGav()); + } + + for (String gav : gavs) { + MavenProject dep = dependencyGavMap.get(gav); + if (dep == null) { + getLog().warn("Unused override dependency " + gav + "; ignoring..."); + continue; + } + if (override.getUrl() != null) { + final List<Pair<String, String>> newLicense = + Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName())); + List<Pair<String, String>> prevLicense = dependencyLicenseMap.put(dep, newLicense); + warnUnlessFlag(dep, IGNORE_LICENSE_OVERRIDE, "license list for " + toGav(dep) + + " changed with <override>; was: " + prevLicense + ", now: " + newLicense); + } + if (override.getNoticeUrl() != null) { + noticeOverrides.put(gav, override.getNoticeUrl()); + warnUnlessFlag(dep, IGNORE_NOTICE_OVERRIDE, + "notice for " + toGav(dep) + " changed with <override>; now: " + override.getNoticeUrl()); + } } } return dependencyLicenseMap; diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java index 0391dfb992..f19df518c1 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java @@ -18,6 +18,9 @@ */ package org.apache.hyracks.maven.license; +import java.util.ArrayList; +import java.util.List; + public class Override { @SuppressWarnings("unused") // set by Maven plugin configuration @@ -26,6 +29,9 @@ public class Override { @SuppressWarnings("unused") // set by Maven plugin configuration private String gav; + @SuppressWarnings("unused") // set by Maven plugin configuration + private List<String> gavs = new ArrayList<>(); + @SuppressWarnings("unused") // set by Maven plugin configuration private String name; @@ -36,6 +42,10 @@ public class Override { return gav; } + public List<String> getGavs() { + return gavs; + } + public String getUrl() { return url; }
