You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2024/12/17 12:48:50 UTC
(asterixdb) 07/12: Merge branch 'gerrit/neo' into 'gerrit/trinity'
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 3f64c58dfdee90c5142700b5d7d1662e5d32da63
Merge: 5aa9a23240 9603080f7d
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Dec 7 22:41:08 2024 -0500
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-64482
Change-Id: I36e4b3c4dd38eeed196eec863a4cc289c8ef7623
asterixdb/asterix-app/pom.xml | 2 +-
.../app/resource/PlanStagesGeneratorTest.java | 10 +-
asterixdb/asterix-external-data/pom.xml | 12 +-
asterixdb/pom.xml | 114 +++-
.../appended-resources/supplemental-models.xml | 714 ++++++++++++++-------
...-library-for-java_refs_tags_v1.17.1_LICENSE.txt | 34 +-
..._tags_azure-core-http-netty_1.13.11_LICENSE.txt | 21 +
..._tags_azure-core-http-netty_1.13.11_NOTICE.txt} | 22 +-
...or-java_refs_tags_azure-core_1.45.1_LICENSE.txt | 21 +
...or-java_refs_tags_azure-core_1.45.1_NOTICE.txt} | 22 +-
...ava_refs_tags_azure-identity_1.13.3_LICENSE.txt | 21 +
...java_refs_tags_azure-identity_1.13.3_NOTICE.txt | 2 +-
...for-java_refs_tags_azure-json_1.3.0_LICENSE.txt | 21 +
...for-java_refs_tags_azure-json_1.3.0_NOTICE.txt} | 2 +-
...efs_tags_azure-storage-blob_12.25.1_LICENSE.txt | 21 +
...efs_tags_azure-storage-blob_12.25.1_NOTICE.txt} | 22 +-
...s_tags_azure-storage-common_12.24.1_LICENSE.txt | 21 +
...s_tags_azure-storage-common_12.24.1_NOTICE.txt} | 20 -
...azure-storage-file-datalake_12.18.1_LICENSE.txt | 21 +
...azure-storage-file-datalake_12.18.1_NOTICE.txt} | 20 -
...azure-storage-internal-avro_12.10.1_LICENSE.txt | 21 +
...azure-storage-internal-avro_12.10.1_NOTICE.txt} | 20 -
...rcontent.com_grpc_grpc-java_v1.68.1_NOTICE.txt} | 0
...com_netty_netty_netty-4.1.115.Final_NOTICE.txt} | 2 +-
...ntent.com_perfmark_perfmark_v0.27.0_NOTICE.txt} | 1 +
...streams_reactive-streams-jvm_v1.0.3_COPYING.txt | 121 ----
...streams_reactive-streams-jvm_v1.0.3_LICENSE.txt | 8 -
hyracks-fullstack/pom.xml | 17 +-
28 files changed, 777 insertions(+), 556 deletions(-)
diff --cc asterixdb/asterix-app/pom.xml
index b7e3b946d8,42da7c9743..d9f235f76d
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@@ -408,8 -407,7 +408,8 @@@
-Dfile.encoding=UTF-8
-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag}
- -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M
+ -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC
+ --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
</argLine>
</configuration>
<goals>
diff --cc asterixdb/asterix-external-data/pom.xml
index 161e5f51ed,6d4799f955..bcccb482b5
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@@ -212,11 -212,7 +212,8 @@@
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
<usedDependency>io.netty:netty-handler-proxy</usedDependency>
+ <usedDependency>io.netty:netty-handler-proxy</usedDependency>
</usedDependencies>
- <ignoredUnusedDeclaredDependencies>
- <unusedDeclaredDependency>io.grpc:grpc-census:*</unusedDeclaredDependency>
- </ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
@@@ -518,15 -518,6 +519,10 @@@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ </dependency>
- <!-- explicitly include grpc-census, to ensure the correct version -->
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-census</artifactId>
- </dependency>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
diff --cc asterixdb/pom.xml
index 197d869148,9d66b79a40..03770129ec
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -83,21 -82,20 +83,22 @@@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.6</hadoop.version>
+ <hadoop.version>3.4.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.19.0</log4j.version>
+ <log4j.version>2.22.1</log4j.version>
- <awsjavasdk.version>2.23.3</awsjavasdk.version>
+ <awsjavasdk.version>2.29.27</awsjavasdk.version>
<parquet.version>1.12.3</parquet.version>
- <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
+ <hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
<azureidentity.version>1.13.3</azureidentity.version>
<azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version>
- <gcsjavasdk.version>2.26.0</gcsjavasdk.version>
+ <gcsjavasdk.version>2.45.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
- <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
++ <hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version>
++ <io.opencensus.version>0.31.1</io.opencensus.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@@ -1939,38 -1952,22 +1958,85 @@@
<version>${hadoop.version}</version>
</dependency>
<!-- Hadoop Azure end -->
+ <!-- Hadoop GCS start -->
+ <dependency>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ <version>${hadoop-gcs.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-compat-qual</artifactId>
+ </exclusion>
- <!-- exclude transitive grpc-api,grpc-census dependencies, as they are bringing in older versions -->
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-census</artifactId>
- </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Hadoop GCS end -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
+ <!-- CVE-2024-8184 -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>9.4.56.v20240826</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ <version>9.4.56.v20240826</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
- <version>1.56.1</version>
++ <version>1.68.1</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-contrib-http-util</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-api</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-impl</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-impl-core</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-exporter-stats-stackdriver</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-contrib-exemplar-util</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-contrib-resource-util</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-exporter-metrics-util</artifactId>
++ <version>${io.opencensus.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>io.opencensus</groupId>
++ <artifactId>opencensus-contrib-grpc-metrics</artifactId>
++ <version>${io.opencensus.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index 721ead23c1,75ea516d4b..4c0ec48259
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -36,8 -36,7 +36,7 @@@
<artifactId>slf4j-api</artifactId>
<licenses>
<license>
- <name>an MIT-style license</name>
- <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.25/slf4j-api/LICENSE.txt</url>
+ <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/slf4j-api/LICENSE.txt</url>
</license>
</licenses>
<properties>
@@@ -847,8 -862,8 +861,8 @@@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<properties>
-- <license.ignoreMissingEmbeddedLicense>3.4.34</license.ignoreMissingEmbeddedLicense>
-- <license.ignoreMissingEmbeddedNotice>3.4.34</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreMissingEmbeddedLicense>3.4.34,3.6.9</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>3.4.34,3.6.9</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@@ -1170,9 -1160,9 +1184,9 @@@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-exemplar-util</artifactId>
<properties>
-- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
-- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
-- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@@ -1183,22 -1173,9 +1197,22 @@@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-exemplar-util</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@@ -1246,8 -1223,19 +1260,30 @@@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-storage-v2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.26.0-alpha</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.26.0-alpha</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.45.0-beta</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.45.0-beta</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
++ <supplement>
++ <project>
++ <groupId>com.google.api.grpc</groupId>
++ <artifactId>proto-google-cloud-storage-control-v2</artifactId>
++ <properties>
++ <license.ignoreMissingEmbeddedLicense>2.39.0-beta</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>2.39.0-beta</license.ignoreMissingEmbeddedNotice>
++ </properties>
++ </project>
++ </supplement>
++
+ <supplement>
+ <project>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-cloud-monitoring-v3</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>3.31.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.31.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@@ -1296,13 -1284,13 +1332,12 @@@
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-iamcredentials</artifactId>
<properties>
-- <license.ignoreMissingEmbeddedLicense>v1-rev20210326-1.32.1</license.ignoreMissingEmbeddedLicense>
-- <license.ignoreMissingEmbeddedNotice>v1-rev20210326-1.32.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreMissingEmbeddedLicense>v1-rev20211203-2.0.0</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>v1-rev20211203-2.0.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
-- <!-- com.google.apis:google-api-services-iamcredentials has embedded ASLv2 in pom.xml -->
<supplement>
<project>
<groupId>com.google.api</groupId>
@@@ -1326,222 -1314,14 +1361,209 @@@
</project>
</supplement>
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-contrib-resource-util</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-exporter-metrics-util</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-exporter-stats-stackdriver</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-impl-core</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.opencensus uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>io.opencensus</groupId>
+ <artifactId>opencensus-impl</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.cloud.bigdataoss uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcs-connector</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>hadoop3-2.2.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>hadoop3-2.2.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>hadoop3-2.2.6</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>hadoop3-2.2.25</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>hadoop3-2.2.25</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>hadoop3-2.2.25</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.cloud.bigdataoss uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>gcsio</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>2.2.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.2.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.2.6</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>2.2.25</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>2.2.25</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>2.2.25</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.cloud.bigdataoss uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>util-hadoop</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>hadoop3-2.2.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>hadoop3-2.2.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>hadoop3-2.2.6</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>hadoop3-2.2.25</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>hadoop3-2.2.25</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>hadoop3-2.2.25</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.cloud.bigdataoss uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.bigdataoss</groupId>
+ <artifactId>util</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>2.2.6</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.2.6</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.2.6</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>2.2.25</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>2.2.25</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>2.2.25</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.flogger uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.flogger</groupId>
+ <artifactId>flogger</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>0.7.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.7.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.7.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.flogger uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.flogger</groupId>
+ <artifactId>google-extensions</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>0.7.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.7.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.7.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.flogger uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.flogger</groupId>
+ <artifactId>flogger-system-backend</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>0.7.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.7.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.7.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
- <!-- com.google.api.grpc uses ALv2 with no NOTICE file -->
- <supplement>
- <project>
- <groupId>com.google.api.grpc</groupId>
- <artifactId>proto-google-cloud-monitoring-v3</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.lmax uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>3.4.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.4.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>3.4.2</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.cloud uses ALv2 with no NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-monitoring</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.82.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.82.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.82.0</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- com.google.api-client uses ALv2 LICENSE and has a NOTICE file -->
+ <supplement>
+ <project>
+ <groupId>com.google.api-client</groupId>
+ <artifactId>google-api-client-jackson2</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>1.32.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.32.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.32.2</license.ignoreLicenseOverride>
++ <license.ignoreMissingEmbeddedLicense>2.0.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>2.0.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>2.0.1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
- <!-- com.google.apis:google-api-services-iamcredentials has embedded ASLv2 in pom.xml -->
+ <!-- com.google.cloud:google-cloud-core is non-fixed ALv2 with no NOTICE file -->
<supplement>
<project>
- <groupId>com.google.apis</groupId>
- <artifactId>google-api-services-iamcredentials</artifactId>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>v1-rev20210326-1.32.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>v1-rev20210326-1.32.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.48.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.48.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@@ -1633,20 -1412,6 +1654,20 @@@
</project>
</supplement>
+ <!-- io.grpc uses ALv2 -->
+ <supplement>
+ <project>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.56.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
++ <license.ignoreMissingEmbeddedLicense>1.68.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>1.68.1</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreLicenseOverride>1.68.1</license.ignoreLicenseOverride>
++ <license.ignoreNoticeOverride>1.68.1</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+
<!-- io.grpc uses ALv2 -->
<supplement>
<project>
@@@ -1813,6 -1626,160 +1882,160 @@@
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.opentelemetry</groupId>
+ <artifactId>detector-resources-support</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>0.32.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.32.0</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.opentelemetry</groupId>
+ <artifactId>exporter-metrics</artifactId>
+ <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreMissingEmbeddedLicense>0.31.0,0.31.1</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>0.31.0,0.31.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>com.google.cloud.opentelemetry</groupId>
+ <artifactId>shared-resourcemapping</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>0.32.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.32.0</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry.contrib</groupId>
+ <artifactId>opentelemetry-gcp-resources</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.37.0-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.37.0-alpha</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.25.0-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.25.0-alpha</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api-incubator</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1-alpha</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-context</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-common</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-logs</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-metrics</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-trace</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.42.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.42.1</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
<!-- org.threeten has no NOTICE file -->
<supplement>
<project>
@@@ -2025,12 -1992,12 +2248,23 @@@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.26.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.26.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.45.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.45.0</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
++ <supplement>
++ <project>
++ <groupId>com.google.cloud</groupId>
++ <artifactId>google-cloud-storage-control</artifactId>
++ <properties>
++ <license.ignoreMissingEmbeddedLicense>2.39.0-beta</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>2.39.0-beta</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
<!-- com.google.j2objc:j2objc-annotations has no NOTICE file -->
<supplement>
<project>
diff --cc hyracks-fullstack/pom.xml
index fce8c39fae,45e97c4090..66b4ebb947
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -69,9 -70,9 +69,9 @@@
<test.includes>${global.test.includes}</test.includes>
<test.excludes>${global.test.excludes}</test.excludes>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <hadoop.version>3.3.6</hadoop.version>
+ <hadoop.version>3.4.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.19.0</log4j.version>
+ <log4j.version>2.22.1</log4j.version>
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>