This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push: new a556b84 [NO ISSUE] Fix msgpack LICENSE/NOTICE inclusions a556b84 is described below commit a556b84c8f3c2208c08ef4d5af7ac7b0f1ee9413 Author: Ian Maxon <ian.ma...@couchbase.com> AuthorDate: Wed Oct 7 01:48:02 2020 -0700 [NO ISSUE] Fix msgpack LICENSE/NOTICE inclusions Change-Id: I7ee331ee5372791fc8373eab0e0eac76d14b91a3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8287 Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <ima...@uci.edu> Reviewed-by: Hussain Towaileb <hussai...@gmail.com> Reviewed-by: Michael Blow <mb...@apache.org> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> --- asterixdb/asterix-server/pom.xml | 4 ++++ .../main/appended-resources/supplemental-models.xml | 19 +++++++++++++++++++ ...content.com_msgpack_msgpack-java_0.8.20_NOTICE.txt | 5 +++++ 3 files changed, 28 insertions(+) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 8dd3222..2c12ab0 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -205,6 +205,10 @@ <gav>org.mindrot:jbcrypt:0.4</gav> <url>http://www.mindrot.org/files/jBCrypt/LICENSE</url> </override> + <override> + <gav>org.msgpack:msgpack-core:0.8.20</gav> + <noticeUrl>https://raw.githubusercontent.com/msgpack/msgpack-java/0.8.20/NOTICE</noticeUrl> + </override> </overrides> <licenses> <license> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 060ce3a..e457628 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -500,6 +500,20 @@ <supplement> <project> + <groupId>org.msgpack</groupId> + <artifactId>msgpack-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>0.8.20</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>0.8.20</license.ignoreMissingEmbeddedLicense> + <license.ignoreNoticeOverride>0.8.20</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <!-- jbcrypt is under an ISC-style license with no NOTICE --> + <!-- see the URL noted in the supplement --> + <supplement> + <project> <groupId>org.mindrot</groupId> <artifactId>jbcrypt</artifactId> <licenses> @@ -508,6 +522,11 @@ <url>http://www.mindrot.org/files/jBCrypt/LICENSE</url> </license> </licenses> + <properties> + <license.ignoreMissingEmbeddedLicense>0.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.4</license.ignoreLicenseOverride> + </properties> </project> </supplement> </supplementalDataModels> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_msgpack_msgpack-java_0.8.20_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_msgpack_msgpack-java_0.8.20_NOTICE.txt new file mode 100644 index 0000000..bc6328d --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_msgpack_msgpack-java_0.8.20_NOTICE.txt @@ -0,0 +1,5 @@ +This product includes the software developed by third-party: + + * Google Guava https://code.google.com/p/guava-libraries/ (APL2) + * sbt-extras: https://github.com/paulp/sbt-extras (BSD) (LICENSE.sbt-extras.txt) +