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 4bdcbc5881eada768016138b6cd0d6bd5a57b0fa Merge: 8a18d73863 1a93ce8b0b Author: Michael Blow <[email protected]> AuthorDate: Mon Oct 9 00:12:55 2023 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I568a2df4594bdde19932ba72362c9661096a9183 .../asterix/active/IActiveNotificationHandler.java | 7 + .../app/active/ActiveNotificationHandler.java | 6 + .../apache/asterix/common/api/IRequestTracker.java | 6 + asterixdb/asterix-external-data/pom.xml | 24 +- .../asterix/runtime/utils/RequestTracker.java | 8 + asterixdb/asterix-server/pom.xml | 8 +- asterixdb/pom.xml | 111 ++---- .../appended-resources/supplemental-models.xml | 382 +++++++-------------- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 ++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 ++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 ---- ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- .../licenses/content/spdx.org_licenses_MIT.txt | 9 + .../apache/hyracks/control/cc/job/IJobManager.java | 5 + .../apache/hyracks/control/cc/job/JobManager.java | 5 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 - hyracks-fullstack/pom.xml | 61 +--- 19 files changed, 310 insertions(+), 472 deletions(-) diff --cc asterixdb/asterix-external-data/pom.xml index 45d1f44ac6,ee4ac894dd..4306864c5c --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@@ -212,7 -212,7 +212,11 @@@ <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> @@@ -514,10 -514,6 +518,15 @@@ </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/asterix-server/pom.xml index dcd8e1b8b8,d47c9e4cc7..479ef8508b --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -485,68 -462,6 +485,61 @@@ <url>https://raw.githubusercontent.com/perfmark/perfmark/v0.26.0/LICENSE</url> <noticeUrl>https://raw.githubusercontent.com/perfmark/perfmark/v0.26.0/NOTICE</noticeUrl> </override> + <override> + <gavs> + <gav>com.google.cloud.bigdataoss:gcs-connector:hadoop3-2.2.6</gav> + <gav>com.google.cloud.bigdataoss:gcsio:2.2.6</gav> + <gav>com.google.cloud.bigdataoss:util-hadoop:hadoop3-2.2.6</gav> + <gav>com.google.cloud.bigdataoss:util:2.2.6</gav> + </gavs> + <url>https://raw.githubusercontent.com/GoogleCloudDataproc/hadoop-connectors/v2.2.6/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.flogger:flogger:0.7.1</gav> + <gav>com.google.flogger:google-extensions:0.7.1</gav> + <gav>com.google.flogger:flogger-system-backend:0.7.1</gav> + </gavs> + <url>https://raw.githubusercontent.com/google/flogger/flogger-0.7.1/LICENSE</url> + </override> + <override> + <gavs> + <gav>com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0</gav> + <gav>com.google.api.grpc:proto-google-cloud-storage-v2:2.2.2-alpha</gav> + <gav>com.google.api.grpc:grpc-google-cloud-storage-v2:2.2.2-alpha</gav> + </gavs> + <url>https://raw.githubusercontent.com/googleapis/googleapis/master/LICENSE</url> + </override> + <override> + <gav>com.lmax:disruptor:3.4.2</gav> + <url>https://raw.githubusercontent.com/LMAX-Exchange/disruptor/3.4.2/LICENCE.txt</url> + </override> + <override> + <gav>com.google.cloud:google-cloud-core-grpc:1.82.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-core/v1.82.0/LICENSE</url> + </override> + <override> + <gav>com.google.cloud:google-cloud-monitoring:1.82.0</gav> + <url>https://raw.githubusercontent.com/googleapis/java-monitoring/1.82.0/LICENSE</url> + </override> + <override> + <gav>com.google.api-client:google-api-client-jackson2:1.32.2</gav> + <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.32.2/LICENSE</url> + </override> + <override> + <gav>org.conscrypt:conscrypt-openjdk-uber:2.5.1</gav> + <url>https://raw.githubusercontent.com/google/conscrypt/2.5.1/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/google/conscrypt/2.5.1/NOTICE</noticeUrl> + </override> + <override> + <gav>io.perfmark:perfmark-api:0.23.0</gav> + <url>https://raw.githubusercontent.com/perfmark/perfmark/v0.23.0/LICENSE</url> + <noticeUrl>https://raw.githubusercontent.com/perfmark/perfmark/v0.23.0/NOTICE</noticeUrl> + </override> + <override> + <gav>com.google.api:gax-grpc:2.7.1</gav> + <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url> + </override> - <override> - <gavs> - <gav>org.bouncycastle:bcprov-jdk15on:1.60</gav> - <gav>org.bouncycastle:bcpkix-jdk15on:1.60</gav> - </gavs> - <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url> - </override> </overrides> <licenses> <license> diff --cc asterixdb/pom.xml index a710303803,6e68ab401c..265aa37c91 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -96,9 -94,8 +96,9 @@@ <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version> <azureidentity.version>1.9.0</azureidentity.version> <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> - <gcsjavasdk.version>2.17.2</gcsjavasdk.version> + <gcsjavasdk.version>2.26.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> + <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -1962,45 -1925,13 +1932,40 @@@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-azure</artifactId> <version>${hadoop.version}</version> - <exclusions> - <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - </exclusion> - </exclusions> </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 --> - - <!-- TODO(htowaileb): removed from hadoop transitively and added separately to avoid CVEs, can - be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs --> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>9.4.51.v20230217</version> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.5.4</version> </dependency> + <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - <version>9.4.51.v20230217</version> ++ <groupId>io.grpc</groupId> ++ <artifactId>grpc-census</artifactId> ++ <version>1.56.1</version> + </dependency> </dependencies> </dependencyManagement> diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index d4efbf1fe8,2b8e438a82..57c6fe689c --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -1291,19 -1265,6 +1290,19 @@@ <project> <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> @@@ -1453,239 -1396,6 +1434,226 @@@ </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> + </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> + </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> + </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> + </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> + </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> + </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> + </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> + </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> + </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> + </properties> + </project> + </supplement> + - <!-- io.perfmark uses ALv2 license --> - <supplement> - <project> - <groupId>io.perfmark</groupId> - <artifactId>perfmark-api</artifactId> - <properties> - <license.ignoreMissingEmbeddedLicense>0.23.0</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>0.23.0</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>0.23.0</license.ignoreLicenseOverride> - </properties> - </project> - </supplement> - + <!-- com.google.apis:google-api-services-iamcredentials has embedded ASLv2 in pom.xml --> + <supplement> + <project> + <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> + </properties> + </project> + </supplement> + <!-- com.google.cloud:google-cloud-core is non-fixed ALv2 with no NOTICE file --> <supplement> <project> @@@ -1778,19 -1483,6 +1741,20 @@@ </project> </supplement> + <!-- io.grpc uses ALv2 --> + <supplement> + <project> + <groupId>io.grpc</groupId> + <artifactId>grpc-census</artifactId> + <properties> - <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice> - <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride> ++ <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> + </properties> + </project> + </supplement> + <!-- io.grpc uses ALv2 --> <supplement> <project>
