>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17309 )
Change subject: [NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps ...................................................................... [NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps Change-Id: I12359da7a9e0347fbcae624777e50190a3d5c472 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17309 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Hussain Towaileb: Looks good to me, approved Michael Blow: Verified Anon. E. Moose #1000171: Jenkins: 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 8edc1b2..d1177a5 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 @@ -119,6 +119,9 @@ private boolean stripFoundationAssertionFromNotices = false; @Parameter + private boolean includeShadowedDependencies = true; + + @Parameter private boolean validateShadowLicenses = false; private SortedMap<String, SortedSet<Project>> noticeMap; @@ -524,6 +527,11 @@ private void gatherShadowedDependencies(Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap, Map<String, MavenProject> dependencyGavMap) throws MojoExecutionException, ProjectBuildingException { + if (!includeShadowedDependencies) { + getLog().info("Not gathering shadowed dependencies as 'includeShadowedDependencies' is set to " + + includeShadowedDependencies); + return; + } Set<MavenProject> projects = new TreeSet<>(Comparator.comparing(MavenProject::getId)); projects.addAll(dependencyLicenseMap.keySet()); for (MavenProject p : projects) { -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17309 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: neo Gerrit-Change-Id: I12359da7a9e0347fbcae624777e50190a3d5c472 Gerrit-Change-Number: 17309 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-MessageType: merged
