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 62525db05f21ab0d26a873e373dc528f23299b72 Merge: 719a3a6 69d5504 Author: Michael Blow <[email protected]> AuthorDate: Mon Jan 24 10:18:28 2022 -0500 Merge branch 'gerrit/stabilization-5e11053887' Change-Id: I62fe3d7d27eb7906fd0922eb5e36f42aeabcde27 .../asterix-grammar-extension-maven-plugin/pom.xml | 1 - asterixdb/asterix-runtime/pom.xml | 1 - asterixdb/asterix-server/pom.xml | 64 ++- asterixdb/pom.xml | 16 +- .../appended-resources/supplemental-models.xml | 239 ++++------ ...ommons.org_publicdomain_zero_1.0_legalcode.txt} | 0 ...e_netty-tcnative-parent-2.0.46.Final_NOTICE.txt | 51 ++ ...90750a18d1b99c27c16b1b11d42f16c622_LICENSE.txt} | 0 ...2290750a18d1b99c27c16b1b11d42f16c622_NOTICE.txt | 514 +++++++++++++++++++++ ....com_Azure_azure-sdk-for-java_master_NOTICE.txt | 159 ------- ....com_netty_netty_netty-4.1.73.Final_NOTICE.txt} | 0 ...streams_reactive-streams-jvm_v1.0.2_LICENSE.txt | 8 - hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 + hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +- .../license-automation-plugin/pom.xml | 5 +- .../apache/hyracks/maven/license/ProjectFlag.java | 10 +- hyracks-fullstack/pom.xml | 50 +- 17 files changed, 735 insertions(+), 389 deletions(-) diff --cc asterixdb/asterix-server/pom.xml index 3b6d6d8,2e6afb2..b4878dc --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -244,193 -217,18 +233,187 @@@ <noticeUrl>https://raw.githubusercontent.com/awslabs/aws-eventstream-java/7be2dd80e12f8835674c8ffb0f4a2efb64c7b585/NOTICE</noticeUrl> </override> <override> + <gav>software.amazon.ion:ion-java:1.0.2</gav> + <noticeUrl>https://raw.githubusercontent.com/amzn/ion-java/v1.0.2/NOTICE</noticeUrl> + </override> + <override> <gavs> - <gav>com.azure:azure-core:1.17.0</gav> - <gav>com.azure:azure-core:1.22.0</gav> - <gav>com.azure:azure-core-http-netty:1.10.0</gav> - <gav>com.azure:azure-core-http-netty:1.11.2</gav> - <gav>com.azure:azure-identity:1.4.1</gav> - <gav>com.azure:azure-storage-blob:12.12.0</gav> - <gav>com.azure:azure-storage-blob:12.14.2</gav> - <gav>com.azure:azure-storage-common:12.12.0</gav> - <gav>com.azure:azure-storage-common:12.14.1</gav> - <gav>com.azure:azure-storage-internal-avro:12.0.5</gav> - <gav>com.azure:azure-storage-internal-avro:12.1.2</gav> - <gav>com.azure:azure-storage-file-datalake:12.7.2</gav> + <gav>com.azure:azure-core:1.24.1</gav> + <gav>com.azure:azure-core-http-netty:1.11.6</gav> + <gav>com.azure:azure-storage-blob:12.14.3</gav> + <gav>com.azure:azure-storage-common:12.14.2</gav> + <gav>com.azure:azure-storage-internal-avro:12.1.3</gav> </gavs> - <noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/NOTICE.txt</noticeUrl> - <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/LICENSE.txt</url> + <!-- azure-storage-blob-batch_12.11.3 release is at 89a32290750a18d1b99c27c16b1b11d42f16c622 --> + <noticeUrl>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/NOTICE.txt</noticeUrl> + <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/89a32290750a18d1b99c27c16b1b11d42f16c622/LICENSE.txt</url> </override> <override> + <gav>com.microsoft.azure:msal4j:1.11.0</gav> + <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-library-for-java/v1.11.0/LICENSE</url> + </override> + <override> + <gav>com.microsoft.azure:msal4j-persistence-extension:1.1.0</gav> + <url>https://raw.githubusercontent.com/AzureAD/microsoft-authentication-extensions-for-java/1.1.0/LICENSE</url> + </override> + <override> + <gav>com.microsoft.azure:azure-keyvault-core:1.2.4</gav> + <url>https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/keyvault/LICENSE</url> + </override> + <override> + <gav>com.nimbusds:nimbus-jose-jwt:9.9.3</gav> + <noticeUrl>https://bitbucket.org/connect2id/nimbus-jose-jwt/raw/50ae2a39a4a6d0dcbf05572af8a581377174ac96/COPYRIGHT.txt</noticeUrl> + </override> + <!-- com.nimbusds:oauth2-oidc-sdk:9.7 points to https://www.apache.org/licenses/LICENSE-2.0.html in the pom.xml but has bad characters in the URI, overriding to fix --> + <override> + <gav>com.nimbusds:oauth2-oidc-sdk:9.7</gav> + <url>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/LICENSE.txt</url> + <noticeUrl>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/COPYRIGHT.txt</noticeUrl> + </override> + <override> + <gav>com.nimbusds:lang-tag:1.5</gav> + <noticeUrl>https://bitbucket.org/connect2id/nimbus-language-tags/raw/ead5120f62b5849309069808509b4cc6e57a0841/COPYRIGHT.txt</noticeUrl> + </override> + <override> + <gav>com.nimbusds:content-type:2.1</gav> + <noticeUrl>https://bitbucket.org/connect2id/nimbus-content-type/raw/c6d2701ed5cd57e0f88728c6f3e6303db97c5bcf/COPYRIGHT.txt</noticeUrl> + </override> + <override> + <gavs> + <gav>io.projectreactor.netty:reactor-netty:1.0.7</gav> + <gav>io.projectreactor.netty:reactor-netty-core:1.0.7</gav> + <gav>io.projectreactor.netty:reactor-netty-http:1.0.7</gav> + <gav>io.projectreactor.netty:reactor-netty-http-brave:1.0.7</gav> + </gavs> + <url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.7/LICENSE</url> + </override> + <override> + <gavs> + <gav>io.projectreactor.netty:reactor-netty-core:1.0.11</gav> + <gav>io.projectreactor.netty:reactor-netty-http:1.0.11</gav> + </gavs> + <url>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.11/LICENSE</url> + </override> + <override> + <gav>io.projectreactor:reactor-core:3.4.6</gav> + <url>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.6/LICENSE</url> + </override> + <override> + <gav>io.projectreactor:reactor-core:3.4.10</gav> + <url>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.10/LICENSE</url> + </override> + <override> + <gavs> + <gav>stax:stax-api:1.0.1</gav> + </gavs> + <url>https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt</url> + </override> + <override> + <gav>org.ow2.asm:asm:9.1</gav> + <url>https://raw.githubusercontent.com/llbit/ow2-asm/master/LICENSE.txt</url> + </override> + <override> + <gavs> + <gav>com.google.http-client:google-http-client-jackson2:1.39.2</gav> + <gav>com.google.http-client:google-http-client-appengine:1.39.2</gav> + <gav>com.google.http-client:google-http-client-gson:1.39.2</gav> + <gav>com.google.http-client:google-http-client-apache-v2:1.39.2</gav> + </gavs> + <url>https://raw.githubusercontent.com/googleapis/google-http-java-client/v1.39.2/LICENSE</url> + </override> + <override> + <gav>com.google.oauth-client:google-oauth-client:1.31.5</gav> + <url>https://raw.githubusercontent.com/googleapis/google-oauth-java-client/v1.31.5/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.protobuf:protobuf-java:3.16.0</gav> + <gav>com.google.protobuf:protobuf-java-util:3.16.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/protocolbuffers/protobuf/v3.16.0/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.auth:google-auth-library-oauth2-http:0.25.5</gav> + <gav>com.google.auth:google-auth-library-credentials:0.25.5</gav> + </gavs> + <url>https://raw.githubusercontent.com/googleapis/google-auth-library-java/v0.25.5/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.cloud:google-cloud-core:1.94.8</gav> + <gav>com.google.cloud:google-cloud-core-http:1.94.8</gav> + </gavs> + <url>https://raw.githubusercontent.com/googleapis/java-core/v1.94.8/LICENSE</url> + </override> + <override> + <gav>com.google.cloud:google-cloud-storage:1.114.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-storage/v1.114.0/LICENSE</url> + </override> + <override> + <gavs> + <gav>io.opencensus:opencensus-api:0.28.0</gav> + <gav>io.opencensus:opencensus-contrib-http-util:0.28.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/census-instrumentation/opencensus-java/v0.28.0/LICENSE</url> + </override> + <override> + <gav>com.google.api-client:google-api-client:1.31.5</gav> + <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.31.5/LICENSE</url> + </override> + <override> + <gav>com.google.api.grpc:proto-google-iam-v1:1.0.13</gav> + <url>https://raw.githubusercontent.com/googleapis/java-iam/v1.0.13/proto-google-iam-v1/LICENSE</url> + </override> + <override> + <gav>com.google.api.grpc:proto-google-common-protos:2.1.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.1.0/proto-google-common-protos/LICENSE</url> + </override> + <override> + <gav>com.google.api:api-common:1.10.3</gav> + <url>https://raw.githubusercontent.com/googleapis/api-common-java/v1.10.3/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.api:gax-httpjson:0.81.0</gav> + <gav>com.google.api:gax:1.64.0</gav> + </gavs> + <url>https://raw.githubusercontent.com/googleapis/gax-java/v1.64.0/LICENSE</url> + </override> + <override> + <gav>com.google.auto.value:auto-value-annotations:1.8.1</gav> + <url>https://raw.githubusercontent.com/google/auto/auto-value-1.8.1/LICENSE</url> + </override> + <override> + <gav>com.google.code.findbugs:jsr305:3.0.2</gav> + <url>https://raw.githubusercontent.com/findbugsproject/findbugs/3.0.2_preview2/findbugs/licenses/LICENSE-jsr305.txt</url> + </override> + <override> + <gav>com.google.code.gson:gson:2.8.6</gav> + <url>https://raw.githubusercontent.com/google/gson/gson-parent-2.8.6/LICENSE</url> + </override> + <override> + <gav>com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava</gav> + <url>https://raw.githubusercontent.com/google/guava/master/COPYING</url> + </override> + <override> + <gav>com.google.j2objc:j2objc-annotations:1.3</gav> + <url>https://raw.githubusercontent.com/google/j2objc/1.3/LICENSE</url> + </override> + <override> + <gav>io.grpc:grpc-context:1.37.0</gav> + <url>https://raw.githubusercontent.com/grpc/grpc-java/v1.37.0/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.37.0/NOTICE.txt</noticeUrl> + </override> + <override> + <gav>org.checkerframework:checker-compat-qual:2.5.5</gav> + <url>https://raw.githubusercontent.com/typetools/checker-framework/checker-framework-2.5.5/LICENSE.txt</url> + </override> + <override> + <gav>com.google.api:api-common:1.10.3</gav> + <url>https://raw.githubusercontent.com/googleapis/api-common-java/v1.10.3/LICENSE</url> + </override> + <override> <gav>org.mindrot:jbcrypt:0.4</gav> <url>http://www.mindrot.org/files/jBCrypt/LICENSE</url> </override> @@@ -552,23 -331,18 +535,30 @@@ <!-- this is special case- handled in ftl template --> <url>PUBLIC_DOMAIN</url> <aliasUrls>Public Domain</aliasUrls> + </license> + <license> + <url>https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt</url> + <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls> + <aliasUrls>https://creativecommons.org/publicdomain/zero/1.0/</aliasUrls> + <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls> + <aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls> </license> + <license> + <displayName>The 2-Clause BSD License</displayName> + <url>https://opensource.org/licenses/BSD-2-Clause</url> + <contentFile>raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt</contentFile> + <aliasUrls> + <aliasURL>https://opensource.org/licenses/bsd-license.php</aliasURL> + <aliasUrl>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</aliasUrl> + </aliasUrls> + </license> + <license> + <displayName>The Go license</displayName> + <url>http://golang.org/LICENSE</url> + <aliasUrls> + <aliasUrl>https://golang.org/LICENSE</aliasUrl> + </aliasUrls> + </license> </licenses> <templateProperties> <packageName>Apache AsterixDB Server Install</packageName> diff --cc asterixdb/pom.xml index 4a75087,838961e..529b6a5 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,18 -82,13 +82,18 @@@ <skip-npm-touch.stage>none</skip-npm-touch.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.6-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.6-SNAPSHOT</hyracks.version> - <hadoop.version>2.8.5</hadoop.version> + <algebricks.version>0.3.7-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.7-SNAPSHOT</hyracks.version> + <hadoop.version>3.3.1</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.17.1</log4j.version> - <awsjavasdk.version>2.17.79</awsjavasdk.version> + <awsjavasdk.version>2.17.116</awsjavasdk.version> - <parquet.version>1.8.2</parquet.version> + <parquet.version>1.12.0</parquet.version> + <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version> + <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version> + <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> + <gcsjavasdk.version>1.114.0</gcsjavasdk.version> + <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -1591,79 -1521,8 +1591,79 @@@ <!-- Azure Blob Storage start --> <dependency> <groupId>com.azure</groupId> + <artifactId>azure-identity</artifactId> + <version>1.4.1</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler-proxy</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-tcnative-boringssl-static</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-kqueue</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns-native-macos</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.azure</groupId> <artifactId>azure-storage-blob</artifactId> - <version>${azureblobjavasdk.version}</version> + <version>12.14.3</version> <exclusions> <exclusion> <groupId>io.netty</groupId> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index 28b688e,6161b32..61ac8b5 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -620,86 -562,6 +565,81 @@@ </supplement> <!-- AWS SDK end --> + <!-- AWS Hadoop SDK start --> + <!-- software.amazon.awssdk is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- license override not needed, ALv2 is specified in its pom.xml --> + <!-- see https://github.com/aws/aws-sdk-java-v2/blob/master/LICENSE.txt --> + <supplement> + <project> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.amazonaws</groupId> + <artifactId>jmespath-java</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-kms</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-dynamodb</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.109</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.109</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>1.12.109</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <!-- software.amazon.ion is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <!-- license override not needed, ALv2 is specified in its pom.xml --> + <!-- see https://github.com/amzn/ion-java --> + <supplement> + <project> + <groupId>software.amazon.ion</groupId> + <artifactId>ion-java</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>1.0.2</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <!-- AWS Hadoop SDK end --> + <!-- com.typesafe.netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> <!-- license override not needed, ALv2 is specified in its pom.xml --> <!-- see https://github.com/playframework/netty-reactive-streams --> @@@ -788,21 -649,6 +727,20 @@@ </project> </supplement> + <!-- com.azure does not contain any embedded LICENSE or NOTICE file --> + <!-- see https://github.com/Azure/azure-sdk-for-java --> + <supplement> + <project> + <groupId>com.azure</groupId> + <artifactId>azure-storage-file-datalake</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>12.7.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>12.7.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>12.7.2</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>12.7.2</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> <project> <groupId>com.azure</groupId> @@@ -854,56 -700,16 +792,55 @@@ </properties> </project> </supplement> + + <supplement> + <project> + <groupId>com.azure</groupId> + <artifactId>azure-identity</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.4.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.4.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.4.1</license.ignoreLicenseOverride> - <license.ignoreNoticeOverride>1.4.1</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + + <!-- com.microsoft.azure:msal4j has MIT license embedded in pom.xml and no notice --> + <supplement> + <project> + <groupId>com.microsoft.azure</groupId> + <artifactId>msal4j</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.11.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.11.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.11.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.microsoft.azure:msal4j-persistence-extension has MIT license embedded in pom.xml and no notice --> + <supplement> + <project> + <groupId>com.microsoft.azure</groupId> + <artifactId>msal4j-persistence-extension</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.1.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.1.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.1.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> <!-- Azure SDK for Java end --> - <!-- jackson-datatype-jsr contains embedded license but has no NOTICE --> - <!-- See https://github.com/FasterXML/jackson-modules-java8 --> + <!-- Azure SDK for Hadoop start --> <supplement> <project> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-storage</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>2.13.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>8.6.6</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>8.6.6</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>8.6.6</license.ignoreLicenseOverride> </properties> </project> </supplement> @@@ -1020,774 -820,13 +957,774 @@@ </project> </supplement> - <!-- io.zipkin.reporter2:zipkin-reporter-brave has embedded license but no notice --> + <!-- com.nimbusds:lang-tag has ALv2 embedded in pom.xml --> <supplement> <project> - <groupId>io.zipkin.reporter2</groupId> - <artifactId>zipkin-reporter-brave</artifactId> + <groupId>com.nimbusds</groupId> + <artifactId>lang-tag</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>2.16.3</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.5</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.nimbusds:content-type has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>com.nimbusds</groupId> + <artifactId>content-type</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2 uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-dom uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-dom</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-jaxb uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-jaxb</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-kdb uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-kdb</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-kdbx uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-kdbx</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:KeePassJava2-simple uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>KeePassJava2-simple</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.linguafranca.pwdb:database uses ALv2 and has no notice --> + <supplement> + <project> + <groupId>org.linguafranca.pwdb</groupId> + <artifactId>database</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.4</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.4</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.4</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- net.minidev:json-smart has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>net.minidev</groupId> + <artifactId>json-smart</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.4.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.4.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- net.minidev:accessors-smart has ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>net.minidev</groupId> + <artifactId>accessors-smart</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.4.7</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.4.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>9.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>9.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>9.1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- GCS SDK for Java start --> + <!-- com.google.http-client is ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client-jackson2</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.39.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.39.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.api has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api</groupId> + <artifactId>api-common</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.10.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.10.3</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.10.3</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.api:gax-httpjson has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api</groupId> + <artifactId>gax-httpjson</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>0.81.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.81.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.81.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.api:gax has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api</groupId> + <artifactId>gax</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.64.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.64.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.64.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.api-client uses non-fixed ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api-client</groupId> + <artifactId>google-api-client</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.31.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.31.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.31.5</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- io.opencensus uses non-fixed ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>0.28.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.28.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.28.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- io.opencensus uses non-fixed ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-http-util</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>0.28.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.28.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.28.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.cloud:google-cloud-core is non-fixed ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.94.8</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.94.8</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.94.8</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.cloud:google-cloud-core-http is non-fixed ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core-http</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.94.8</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.94.8</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.94.8</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.auth has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.auth</groupId> + <artifactId>google-auth-library-credentials</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>0.25.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.25.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.25.5</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- io.grpc:grpc-context uses non-fixed ALv2 and has no NOTICE --> + <supplement> + <project> + <groupId>io.grpc</groupId> + <artifactId>grpc-context</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.37.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.37.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.37.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.protobuf has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java-util</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>3.16.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.16.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>3.16.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.auth has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.auth</groupId> + <artifactId>google-auth-library-oauth2-http</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>0.25.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.25.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.25.5</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.protobuf has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>3.16.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.16.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>3.16.0</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.threeten has no NOTICE file --> + <supplement> + <project> + <groupId>org.threeten</groupId> + <artifactId>threetenbp</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>1.5.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.http-client is ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.39.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.39.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.http-client is ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client-appengine</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.39.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.39.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.http-client is ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client-apache-v2</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.39.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.39.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.http-client is ALv2 with no NOTICE file --> + <supplement> + <project> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client-gson</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.39.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.39.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.code.findbugs:jsr305 has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>3.0.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.0.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>3.0.2</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.code.gson:gson uses non-fixed ALv2 and has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.8.6</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.8.6</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.8.6</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.guava:listenablefuture uses non-fixed ALv2 and has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>9999.0-empty-to-avoid-conflict-with-guava</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>9999.0-empty-to-avoid-conflict-with-guava</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>9999.0-empty-to-avoid-conflict-with-guava</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- org.checkerframework:checker-compat-qual has no NOTICE file --> + <supplement> + <project> + <groupId>org.checkerframework</groupId> + <artifactId>checker-compat-qual</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.5.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.5.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.5.5</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.api:api-common has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api</groupId> + <artifactId>api-common</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.10.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.10.3</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.10.3</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.auto.value:auto-value-annotations has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value-annotations</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.8.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.8.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- javax.annotation:javax.annotation-api has no NOTICE file --> + <supplement> + <project> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.3.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.3.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.apis:google-api-services-storage has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.apis</groupId> + <artifactId>google-api-services-storage</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>v1-rev20210127-1.31.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>v1-rev20210127-1.31.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.oauth-client:google-oauth-client:1.31.5 uses non-fixed ALv2 and has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.oauth-client</groupId> + <artifactId>google-oauth-client</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.31.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.31.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.31.5</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- com.google.api.grpc:proto-google-iam-v1 has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api.grpc</groupId> + <artifactId>proto-google-iam-v1</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.13</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.13</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.api.grpc:proto-google-common-protos has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.api.grpc</groupId> + <artifactId>proto-google-common-protos</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.1.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.cloud:google-cloud-storage has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-storage</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.114.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.114.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.google.j2objc:j2objc-annotations has no NOTICE file --> + <supplement> + <project> + <groupId>com.google.j2objc</groupId> + <artifactId>j2objc-annotations</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.3</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.3</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + <!-- GCS SDK for Java end --> + + <!-- jackson-datatype-jsr contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/jackson-modules-java8 --> + <supplement> + <project> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <properties> - <license.ignoreMissingEmbeddedNotice>2.12.3,2.12.5</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedNotice>2.13.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.fasterxml.woodstox contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/woodstox --> + <supplement> + <project> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + <properties> - <license.ignoreMissingEmbeddedNotice>6.2.4</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreMissingEmbeddedNotice>6.2.7</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.codehaus.woodstox contains embedded license but has no NOTICE --> + <!-- See https://github.com/FasterXML/stax2-api --> + <supplement> + <project> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>4.2.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.0.1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + + <!-- net.java.dev.jna:jna has embedded license but no notice --> + <supplement> + <project> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>5.5.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- net.java.dev.jna:jna-platform has embedded license but no notice --> + <supplement> + <project> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>5.6.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin2:zipkin has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.zipkin2</groupId> + <artifactId>zipkin</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.23.2</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin.reporter2:zipkin-reporter has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.reporter2</groupId> + <artifactId>zipkin-reporter</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.16.3</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- io.zipkin.reporter2:zipkin-reporter-brave has embedded license but no notice --> + <supplement> + <project> + <groupId>io.zipkin.reporter2</groupId> + <artifactId>zipkin-reporter-brave</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>2.16.3</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.fasterxml:aalto-xml has embedded license but no notice --> + <supplement> + <project> + <groupId>com.fasterxml</groupId> + <artifactId>aalto-xml</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>1.0.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- com.github.stephenc.jcip:jcip-annotations is ALv2 embedded in pom.xml and has no notice --> + <supplement> + <project> + <groupId>com.github.stephenc.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.0-1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.0-1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.jetbrains:annotations is ALv2 embedded in pom.xml and has no notice --> + <supplement> + <project> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>15.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>15.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- org.simpleframework:simple-xml is ALv2 embedded in pom.xml --> + <supplement> + <project> + <groupId>org.simpleframework</groupId> + <artifactId>simple-xml</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>2.7.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.7.1</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.4.9-1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.4.9-1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.4.9-1</license.ignoreLicenseOverride> + </properties> + </project> + </supplement> + <!-- Apache Parquet --> + <supplement> + <project> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-format-structures</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <supplement> + <project> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-common</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- Contains embedded LICENSE but missing NOTICE --> + <supplement> + <project> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-column</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- Contains embedded LICENSE but missing NOTICE --> + <supplement> + <project> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-encoding</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> + </properties> + </project> + </supplement> + + <!-- Contains embedded LICENSE but missing NOTICE --> + <supplement> + <project> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-hadoop</artifactId> + <properties> + <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --cc hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java index 6fd15a8,c7b2e52..d61dde1 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java @@@ -61,8 -59,7 +61,9 @@@ enum ProjectFlag break; case ALTERNATE_LICENSE_FILE: case ALTERNATE_NOTICE_FILE: + case ON_MULTIPLE_EMBEDDED_NOTICE: + case ON_MULTIPLE_EMBEDDED_LICENSE: + boolean found = false; for (String spec : StringUtils.split(value, ",")) { String[] specSplit = StringUtils.split(spec, ":"); if (specSplit.length != 2) {
