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 cd050c80e4adc87f7f0ad537e2410117ef5101c2 Author: Hussain Towaileb <[email protected]> AuthorDate: Fri Feb 4 16:49:13 2022 +0300 [ASTERIXDB-3009][EXT]: Update Google Cloud Storage to 2.3.0 Change-Id: I2df742f11be39c29da4545a7016ed77088e62159 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15143 Reviewed-by: Michael Blow <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Hussain Towaileb <[email protected]> --- asterixdb/asterix-server/pom.xml | 89 +++++----- asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 179 ++++++++++----------- ....com_google_gson_gson-parent-2.8.9_LICENSE.txt} | 0 ..._googleapis_api-common-java_v2.1.2_LICENSE.txt} | 0 ...ent.com_googleapis_gax-java_v2.8.1_LICENSE.txt} | 0 ...pis_google-api-java-client_v1.33.0_LICENSE.txt} | 0 ...is_google-auth-library-java_v1.3.0_LICENSE.txt} | 0 ...is_google-http-java-client_v1.41.0_LICENSE.txt} | 0 ...s_google-oauth-java-client_v1.32.1_LICENSE.txt} | 0 ...nt.com_googleapis_java-core_v2.3.5_LICENSE.txt} | 0 ...content.com_grpc_grpc-java_v1.43.2_LICENSE.txt} | 0 ...rcontent.com_grpc_grpc-java_v1.43.2_NOTICE.txt} | 0 ...m_protocolbuffers_protobuf_v3.19.2_LICENSE.txt} | 0 14 files changed, 124 insertions(+), 146 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 1c7208e..d8ad238 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -314,41 +314,42 @@ </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> + <gav>com.google.http-client:google-http-client:1.41.0</gav> + <gav>com.google.http-client:google-http-client-jackson2:1.41.0</gav> + <gav>com.google.http-client:google-http-client-appengine:1.41.0</gav> + <gav>com.google.http-client:google-http-client-gson:1.41.0</gav> + <gav>com.google.http-client:google-http-client-apache-v2:1.41.0</gav> </gavs> - <url>https://raw.githubusercontent.com/googleapis/google-http-java-client/v1.39.2/LICENSE</url> + <url>https://raw.githubusercontent.com/googleapis/google-http-java-client/v1.41.0/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> + <gav>com.google.oauth-client:google-oauth-client:1.32.1</gav> + <url>https://raw.githubusercontent.com/googleapis/google-oauth-java-client/v1.32.1/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> + <gav>com.google.protobuf:protobuf-java:3.19.2</gav> + <gav>com.google.protobuf:protobuf-java-util:3.19.2</gav> </gavs> - <url>https://raw.githubusercontent.com/protocolbuffers/protobuf/v3.16.0/LICENSE</url> + <url>https://raw.githubusercontent.com/protocolbuffers/protobuf/v3.19.2/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> + <gav>com.google.auth:google-auth-library-oauth2-http:1.3.0</gav> + <gav>com.google.auth:google-auth-library-credentials:1.3.0</gav> </gavs> - <url>https://raw.githubusercontent.com/googleapis/google-auth-library-java/v0.25.5/LICENSE</url> + <url>https://raw.githubusercontent.com/googleapis/google-auth-library-java/v1.3.0/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> + <gav>com.google.cloud:google-cloud-core:2.3.5</gav> + <gav>com.google.cloud:google-cloud-core-http:2.3.5</gav> </gavs> - <url>https://raw.githubusercontent.com/googleapis/java-core/v1.94.8/LICENSE</url> + <url>https://raw.githubusercontent.com/googleapis/java-core/v2.3.5/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> + <gav>com.google.cloud:google-cloud-storage:2.3.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-storage/v2.3.0/LICENSE</url> </override> <override> <gavs> @@ -358,39 +359,39 @@ <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> + <gav>com.google.api-client:google-api-client:1.33.0</gav> + <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.33.0/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> + <gav>com.google.api.grpc:proto-google-iam-v1:1.2.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-iam/v1.2.0/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> + <gav>com.google.api.grpc:proto-google-common-protos:2.7.1</gav> + <url>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.7.1/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> + <gav>com.google.api:api-common:2.1.2</gav> + <url>https://raw.githubusercontent.com/googleapis/api-common-java/v2.1.2/LICENSE</url> </override> <override> <gavs> - <gav>com.google.api:gax-httpjson:0.81.0</gav> - <gav>com.google.api:gax:1.64.0</gav> + <gav>com.google.api:gax-httpjson:0.93.1</gav> + <gav>com.google.api:gax:2.8.1</gav> </gavs> - <url>https://raw.githubusercontent.com/googleapis/gax-java/v1.64.0/LICENSE</url> + <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.8.1/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> + <gav>com.google.auto.value:auto-value-annotations:1.9</gav> + <url>https://raw.githubusercontent.com/google/auto/auto-value-1.9/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> + <gav>com.google.code.gson:gson:2.8.9</gav> + <url>https://raw.githubusercontent.com/google/gson/gson-parent-2.8.9/LICENSE</url> </override> <override> <gav>com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava</gav> @@ -401,17 +402,9 @@ <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> + <gav>io.grpc:grpc-context:1.43.2</gav> + <url>https://raw.githubusercontent.com/grpc/grpc-java/v1.43.2/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/grpc/grpc-java/v1.43.2/NOTICE.txt</noticeUrl> </override> <override> <gav>org.mindrot:jbcrypt:0.4</gav> @@ -467,11 +460,11 @@ <aliasUrl>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.10/LICENSE</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt</aliasUrl> <aliasUrl>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/LICENSE.txt</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/google/auto/auto-value-1.8.1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/google/auto/auto-value-1.9/LICENSE</aliasUrl> <aliasUrl>https://raw.githubusercontent.com/google/j2objc/1.3/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.1.0/proto-google-common-protos/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-iam/v1.0.13/proto-google-iam-v1/LICENSE</aliasUrl> - <aliasUrl>https://raw.githubusercontent.com/googleapis/java-storage/v1.114.0/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-common-protos/v2.7.1/proto-google-common-protos/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-iam/v1.2.0/proto-google-iam-v1/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/googleapis/java-storage/v2.3.0/LICENSE</aliasUrl> <aliasUrl>http://repository.jboss.org/licenses/apache-2.0.txt</aliasUrl> </aliasUrls> <metric>1</metric> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 7f5ffaa..40ff4e6 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -92,7 +92,7 @@ <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> + <gcsjavasdk.version>2.3.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 61ac8b5..825c845 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -1109,27 +1109,15 @@ </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> + <license.ignoreMissingEmbeddedLicense>2.1.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.1.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.1.2</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1140,9 +1128,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>0.93.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>0.93.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>0.93.1</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1153,9 +1141,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.8.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.8.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.8.1</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1166,9 +1154,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.33.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.33.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.33.0</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1205,9 +1193,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.3.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.3.5</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1218,9 +1206,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.3.5</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.5</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.3.5</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1231,48 +1219,48 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.3.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.3.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.3.0</license.ignoreLicenseOverride> </properties> </project> </supplement> - <!-- io.grpc:grpc-context uses non-fixed ALv2 and has no NOTICE --> + <!-- com.google.auth has no NOTICE file --> <supplement> <project> - <groupId>io.grpc</groupId> - <artifactId>grpc-context</artifactId> + <groupId>com.google.auth</groupId> + <artifactId>google-auth-library-oauth2-http</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>1.37.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.37.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>1.37.0</license.ignoreLicenseOverride> + <license.ignoreMissingEmbeddedLicense>1.3.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.3.0</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.3.0</license.ignoreLicenseOverride> </properties> </project> </supplement> - <!-- com.google.protobuf has no NOTICE file --> + <!-- io.grpc:grpc-context uses non-fixed ALv2 and has no NOTICE --> <supplement> <project> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java-util</artifactId> + <groupId>io.grpc</groupId> + <artifactId>grpc-context</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>3.16.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>3.16.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>3.16.0</license.ignoreLicenseOverride> + <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride> </properties> </project> </supplement> - <!-- com.google.auth has no NOTICE file --> + <!-- com.google.protobuf has no NOTICE file --> <supplement> <project> - <groupId>com.google.auth</groupId> - <artifactId>google-auth-library-oauth2-http</artifactId> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java-util</artifactId> <properties> - <license.ignoreMissingEmbeddedLicense>0.25.5</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>0.25.5</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>0.25.5</license.ignoreLicenseOverride> + <license.ignoreMissingEmbeddedLicense>3.19.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.19.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>3.19.2</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1283,9 +1271,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>3.19.2</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>3.19.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>3.19.2</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1296,7 +1284,19 @@ <groupId>org.threeten</groupId> <artifactId>threetenbp</artifactId> <properties> - <license.ignoreMissingEmbeddedNotice>1.5.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>1.5.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-jackson2</artifactId> + <properties> + <license.ignoreMissingEmbeddedLicense>1.41.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.41.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1307,8 +1307,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.41.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.41.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1319,8 +1319,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.41.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.41.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1331,8 +1331,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.41.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.41.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1343,8 +1343,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.41.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.41.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1368,9 +1368,9 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.8.9</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.8.9</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>2.8.9</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1392,24 +1392,9 @@ <supplement> <project> <groupId>org.checkerframework</groupId> - <artifactId>checker-compat-qual</artifactId> + <artifactId>checker-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> + <license.ignoreMissingEmbeddedNotice>3.20.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1420,8 +1405,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.9</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.9</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1444,21 +1429,21 @@ <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> + <license.ignoreMissingEmbeddedLicense>v1-rev20211201-1.32.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>v1-rev20211201-1.32.1</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> - <!-- com.google.oauth-client:google-oauth-client:1.31.5 uses non-fixed ALv2 and has no NOTICE file --> + <!-- com.google.oauth-client:google-oauth-client 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> + <license.ignoreMissingEmbeddedLicense>1.32.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.32.1</license.ignoreMissingEmbeddedNotice> + <license.ignoreLicenseOverride>1.32.1</license.ignoreLicenseOverride> </properties> </project> </supplement> @@ -1469,8 +1454,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>1.2.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>1.2.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1481,8 +1466,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.7.1</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.7.1</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> @@ -1493,8 +1478,8 @@ <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> + <license.ignoreMissingEmbeddedLicense>2.3.0</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>2.3.0</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.37.0_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_google_gson_gson-parent-2.8.9_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.37.0_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_google_gson_gson-parent-2.8.9_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_api-common-java_v1.10.3_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_api-common-java_v2.1.2_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_api-common-java_v1.10.3_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_api-common-java_v2.1.2_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_gax-java_v1.64.0_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_gax-java_v2.8.1_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_gax-java_v1.64.0_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_gax-java_v2.8.1_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_java-core_v1.94.8_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-api-java-client_v1.33.0_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_java-core_v1.94.8_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-api-java-client_v1.33.0_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-auth-library-java_v0.25.5_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-auth-library-java_v1.3.0_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-auth-library-java_v0.25.5_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-auth-library-java_v1.3.0_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-oauth-java-client_v1.31.5_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-http-java-client_v1.41.0_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-oauth-java-client_v1.31.5_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-http-java-client_v1.41.0_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-http-java-client_v1.39.2_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-oauth-java-client_v1.32.1_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-http-java-client_v1.39.2_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-oauth-java-client_v1.32.1_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-api-java-client_v1.31.5_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_java-core_v2.3.5_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_google-api-java-client_v1.31.5_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_googleapis_java-core_v2.3.5_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_google_gson_gson-parent-2.8.6_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.43.2_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_google_gson_gson-parent-2.8.6_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.43.2_LICENSE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.37.0_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.43.2_NOTICE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.37.0_NOTICE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.43.2_NOTICE.txt diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_protocolbuffers_protobuf_v3.16.0_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_protocolbuffers_protobuf_v3.19.2_LICENSE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_protocolbuffers_protobuf_v3.16.0_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_protocolbuffers_protobuf_v3.19.2_LICENSE.txt
