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:40 UTC
[asterixdb] 10/10: Merge branch 'gerrit/neo'
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 576493d894533e9f0eb8d7f09fd8defde6a7627f
Merge: 7436ac1aa8 6512463b02
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Jan 25 20:46:08 2023 -0500
Merge branch 'gerrit/neo'
Change-Id: Icbdf3638df8547973adb3313ce193563a0c0ab0c
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/maven/license/GenerateFileMojo.java | 68 +++++++++++------
.../apache/hyracks/maven/license/LicenseMojo.java | 6 ++
.../apache/hyracks/maven/license/ProjectFlag.java | 39 ++++++++--
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
13 files changed, 152 insertions(+), 97 deletions(-)
diff --cc hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 2c7a23b0f5,5c1110689f..c548179d9c
--- 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
@@@ -526,15 -532,14 +532,19 @@@ public class GenerateFileMojo extends L
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));
+ if (!includeShadowedDependencies) {
+ getLog().info("Not gathering shadowed dependencies as 'includeShadowedDependencies' is set to "
+ + includeShadowedDependencies);
+ return;
+ }
projects.addAll(dependencyLicenseMap.keySet());
for (MavenProject p : projects) {
- boolean finished = false;
File artifactFile = p.getArtifact().getFile();
if (!artifactFile.exists()) {
throw new MojoExecutionException("Artifact file " + artifactFile + " does not exist!");