You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/01/27 14:19:31 UTC
[asterixdb] 01/10: [NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 2aa06c577b4ae6a9e7d590525f5978023272a35a
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jan 10 08:28:31 2023 -0500
[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 <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Tested-by: Michael Blow <mb...@apache.org>
---
.../java/org/apache/hyracks/maven/license/GenerateFileMojo.java | 8 ++++++++
1 file changed, 8 insertions(+)
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 8edc1b212f..d1177a5ec7 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
@@ -118,6 +118,9 @@ public class GenerateFileMojo extends LicenseMojo {
@Parameter
private boolean stripFoundationAssertionFromNotices = false;
+ @Parameter
+ private boolean includeShadowedDependencies = true;
+
@Parameter
private boolean validateShadowLicenses = false;
@@ -524,6 +527,11 @@ public class GenerateFileMojo extends LicenseMojo {
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) {