From 5e44128bc13a93a3cadb12a87ecd691218481447 Mon Sep 17 00:00:00 2001 From: Hussain Towaileb Date: Wed, 13 May 2020 03:02:49 +0300 Subject: [PATCH] [ASTERIXDB-2729][LIC] Fix license warnings in newly added AWS libraries & dependencies - user model changes: no - storage format changes: no - interface changes: no Details: - Added all missing licenses. - Silenced all warnings being generated by the licenses. - Updated the license check to accept property for convenience of use. Change-Id: I0ab576d748799a59d23990e2379bdf6aed74a7e5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/6284 Integration-Tests: Jenkins Tested-by: Jenkins Reviewed-by: Hussain Towaileb Reviewed-by: Michael Blow --- asterixdb/asterix-server/pom.xml | 24 ++ .../supplemental-models.xml | 227 ++++++++++++++++++ ...com_aws_aws-sdk-java-v2_2.10.83_NOTICE.txt | 16 ++ ...12f8835674c8ffb0f4a2efb64c7b585_NOTICE.txt | 2 + .../hyracks/maven/license/LicenseMojo.java | 42 ++-- .../hyracks/maven/license/Override.java | 10 + 6 files changed, 304 insertions(+), 17 deletions(-) create mode 100644 asterixdb/src/main/licenses/content/raw.githubusercontent.com_aws_aws-sdk-java-v2_2.10.83_NOTICE.txt create mode 100644 asterixdb/src/main/licenses/content/raw.githubusercontent.com_awslabs_aws-eventstream-java_7be2dd80e12f8835674c8ffb0f4a2efb64c7b585_NOTICE.txt diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index a542c705f8d..2f367aa4a86 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -177,6 +177,30 @@ https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/COPYING.txt https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/LICENSE.txt + + + software.amazon.awssdk:sdk-core:2.10.83 + software.amazon.awssdk:aws-core:2.10.83 + software.amazon.awssdk:auth:2.10.83 + software.amazon.awssdk:arns:2.10.83 + software.amazon.awssdk:annotations:2.10.83 + software.amazon.awssdk:utils:2.10.83 + software.amazon.awssdk:aws-query-protocol:2.10.83 + software.amazon.awssdk:profiles:2.10.83 + software.amazon.awssdk:protocol-core:2.10.83 + software.amazon.awssdk:s3:2.10.83 + software.amazon.awssdk:netty-nio-client:2.10.83 + software.amazon.awssdk:apache-client:2.10.83 + software.amazon.awssdk:aws-xml-protocol:2.10.83 + software.amazon.awssdk:regions:2.10.83 + software.amazon.awssdk:http-client-spi:2.10.83 + + https://raw.githubusercontent.com/aws/aws-sdk-java-v2/2.10.83/NOTICE.txt + + + software.amazon.eventstream:eventstream:1.0.1 + https://raw.githubusercontent.com/awslabs/aws-eventstream-java/7be2dd80e12f8835674c8ffb0f4a2efb64c7b585/NOTICE + diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 04740f3c140..0bb23f0c8c6 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -271,4 +271,231 @@ + + + + + + + + software.amazon.awssdk + sdk-core + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + aws-core + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + s3 + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + auth + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + protocol-core + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + regions + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + arns + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + netty-nio-client + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + aws-xml-protocol + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + annotations + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + apache-client + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + utils + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + http-client-spi + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + aws-query-protocol + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + software.amazon.awssdk + profiles + + 2.10.83 + 2.10.83 + 2.10.83 + + + + + + + + + + software.amazon.eventstream + eventstream + + 1.0.1 + 1.0.1 + 1.0.1 + + + + + + + + + + + com.typesafe.netty + netty-reactive-streams + + 2.0.4 + 2.0.4 + + + + + + + com.typesafe.netty + netty-reactive-streams-http + + 2.0.4 + 2.0.4 + + + + + + + + + org.reactivestreams + reactive-streams + + 1.0.2 + 1.0.2 + 1.0.2 + 1.0.2 + + + + diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_aws_aws-sdk-java-v2_2.10.83_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_aws_aws-sdk-java-v2_2.10.83_NOTICE.txt new file mode 100644 index 00000000000..f3c67c61dc2 --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_aws_aws-sdk-java-v2_2.10.83_NOTICE.txt @@ -0,0 +1,16 @@ +AWS SDK for Java 2.0 +Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + +This product includes software developed by +Amazon Technologies, Inc (http://www.amazon.com/). + +********************** +THIRD PARTY COMPONENTS +********************** +This software includes third party software subject to the following copyrights: +- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. +- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. +- Apache Commons Lang - https://github.com/apache/commons-lang +- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams + +The licenses for these third party components are included in LICENSE.txt \ No newline at end of file diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_awslabs_aws-eventstream-java_7be2dd80e12f8835674c8ffb0f4a2efb64c7b585_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_awslabs_aws-eventstream-java_7be2dd80e12f8835674c8ffb0f4a2efb64c7b585_NOTICE.txt new file mode 100644 index 00000000000..6822ad69282 --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_awslabs_aws-eventstream-java_7be2dd80e12f8835674c8ffb0f4a2efb64c7b585_NOTICE.txt @@ -0,0 +1,2 @@ +AWS EventStream for Java +Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file 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 e72404cd68f..89993fda0b6 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 @@ protected Map>> gatherDependencies() thr 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> newLicense = - Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName())); - List> prevLicense = dependencyLicenseMap.put(dep, newLicense); - warnUnlessFlag(dep, IGNORE_LICENSE_OVERRIDE, "license list for " + toGav(dep) - + " changed with ; was: " + prevLicense + ", now: " + newLicense); - } - if (override.getNoticeUrl() != null) { - noticeOverrides.put(gav, override.getNoticeUrl()); - warnUnlessFlag(dep, IGNORE_NOTICE_OVERRIDE, - "notice for " + toGav(dep) + " changed with ; now: " + override.getNoticeUrl()); + + // Collect both and ... + List 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> newLicense = + Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName())); + List> prevLicense = dependencyLicenseMap.put(dep, newLicense); + warnUnlessFlag(dep, IGNORE_LICENSE_OVERRIDE, "license list for " + toGav(dep) + + " changed with ; was: " + prevLicense + ", now: " + newLicense); + } + if (override.getNoticeUrl() != null) { + noticeOverrides.put(gav, override.getNoticeUrl()); + warnUnlessFlag(dep, IGNORE_NOTICE_OVERRIDE, + "notice for " + toGav(dep) + " changed with ; 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 0391dfb992c..f19df518c14 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 gavs = new ArrayList<>(); + @SuppressWarnings("unused") // set by Maven plugin configuration private String name; @@ -36,6 +42,10 @@ public String getGav() { return gav; } + public List getGavs() { + return gavs; + } + public String getUrl() { return url; }