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 2022/01/25 03:41:01 UTC

[asterixdb] 09/13: Merge branch 'gerrit/stabilization-02ea049d7a'

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 a7f6d399455b90e6ecf77b43baa02cae403e3b42
Merge: 14d9cfd fa0ddb6
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Jan 23 10:38:03 2022 -0500

    Merge branch 'gerrit/stabilization-02ea049d7a'
    
    Change-Id: Icde6ac90cccb845b4973155eac5a0380e8f6ff58

 .../runtimets/testsuite_external_dataset_s3.xml    |   2 +-
 .../asterix-grammar-extension-maven-plugin/pom.xml |   1 -
 asterixdb/asterix-runtime/pom.xml                  |   1 -
 asterixdb/asterix-server/pom.xml                   |  42 +++---
 asterixdb/pom.xml                                  |  14 +-
 .../appended-resources/supplemental-models.xml     | 165 ++++++++-------------
 ...ommons.org_publicdomain_zero_1.0_legalcode.txt} |   0
 ...e_netty-tcnative-parent-2.0.46.Final_NOTICE.txt |  51 +++++++
 ....com_netty_netty_netty-4.1.73.Final_NOTICE.txt} |   0
 ...treams_reactive-streams-jvm_v1.0.3_LICENSE.txt} |   0
 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                          |  54 ++++---
 15 files changed, 187 insertions(+), 164 deletions(-)

diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index b354e65,0000000..ead8e89
mode 100644,000000..100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@@ -1,316 -1,0 +1,316 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 +<!--
 + ! Licensed to the Apache Software Foundation (ASF) under one
 + ! or more contributor license agreements.  See the NOTICE file
 + ! distributed with this work for additional information
 + ! regarding copyright ownership.  The ASF licenses this file
 + ! to you under the Apache License, Version 2.0 (the
 + ! "License"); you may not use this file except in compliance
 + ! with the License.  You may obtain a copy of the License at
 + !
 + !   http://www.apache.org/licenses/LICENSE-2.0
 + !
 + ! Unless required by applicable law or agreed to in writing,
 + ! software distributed under the License is distributed on an
 + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + ! KIND, either express or implied.  See the License for the
 + ! specific language governing permissions and limitations
 + ! under the License.
 + !-->
 +<test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries_sqlpp" QueryFileExtension=".sqlpp">
 +  <test-group name="aws-s3-external-dataset">
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/json/json">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/json/json</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset/s3">
 +      <compilation-unit name="create-with-session-token">
 +        <output-dir compare="Text">create-with-session-token</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/json/gz">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/json/gz</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/json/mixed">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/json/mixed</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/csv/csv">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/csv/csv</output-dir>
 +      </compilation-unit>
 +    </test-case><test-case FilePath="external-dataset">
 +      <compilation-unit name="common/csv/gz">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/csv/gz</output-dir>
 +      </compilation-unit>
 +    </test-case><test-case FilePath="external-dataset">
 +      <compilation-unit name="common/csv/mixed">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/csv/mixed</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/tsv/tsv">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/tsv/tsv</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/tsv/gz">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/tsv/gz</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/tsv/mixed">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/tsv/mixed</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/empty-string-definition">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/empty-string-definition</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/over-1000-objects">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/over-1000-objects</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/malformed-json">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/malformed-json</output-dir>
 +        <expected-error>Parsing error at malformed-data/duplicate-fields.json line 1 field 'field': Duplicate field 'field'</expected-error>
 +        <expected-error>Parsing error at malformed-data/malformed-json.json line 1 field 'field': Unexpected character ('}' (code 125)): was expecting double-quote to start field name</expected-error>
 +        <expected-error>Parsing error at malformed-data/malformed-json-2.json line 4 field 'array_f': Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
 +        <expected-error>Parsing error at malformed-data/malformed-jsonl-1.json line 3 field 'field2': Unrecognized token 'truee': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
 +        <expected-error>Parsing error at malformed-data/malformed-jsonl-2.json line 11 field 'array_f': Unexpected character (']' (code 93)): expected a valid value (JSON String, Number, Array, Object or token 'null', 'true' or 'false')</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/definition-does-not-exist">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/definition-does-not-exist</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/invalid-endpoint">
 +        <placeholder name="adapter" value="S3" />
 +        <placeholder name="serviceEndpoint" value="^invalid-endpoint^" />
 +        <output-dir compare="Text">common/invalid-endpoint</output-dir>
 +        <expected-error>External source error. Invalid service endpoint ^invalid-endpoint^</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/bucket-does-not-exist">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/bucket-does-not-exist</output-dir>
-         <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null)</expected-error>
++        <expected-error>External source error. The specified bucket does not exist (Service: S3, Status Code: 404, Request ID: null, Extended Request ID: null)</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset" check-warnings="true">
 +      <compilation-unit name="common/no-files-returned/definition-points-to-nothing">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/no-files-returned/definition-points-to-nothing</output-dir>
 +        <source-location>false</source-location>
 +        <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
 +        <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset" check-warnings="true">
 +      <compilation-unit name="common/no-files-returned/exclude-all-files">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/no-files-returned/exclude-all-files</output-dir>
 +        <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset" check-warnings="true">
 +      <compilation-unit name="common/no-files-returned/include-no-files">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/no-files-returned/include-no-files</output-dir>
 +        <expected-warn>The provided external dataset configuration returned no files from the external source</expected-warn>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset/s3">
 +      <compilation-unit name="non-s3-region">
 +        <output-dir compare="Text">non-s3-region</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset/s3">
 +      <compilation-unit name="anonymous_no_auth">
 +        <output-dir compare="Text">anonymous_no_auth</output-dir>
 +        <expected-error>ASX3119: Parameter 'secretAccessKey' is required if 'accessKeyId' is provided</expected-error>
 +        <expected-error>ASX3119: Parameter 'accessKeyId' is required if 'secretAccessKey' is provided</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset/common">
 +      <compilation-unit name="query-with-limit-plan">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">query-with-limit-plan</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +  </test-group>
 +  <test-group name="s3-include-exclude">
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/bad-name-1">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/bad-name-1</output-dir>
 +        <expected-error>Invalid format for property "exclude1"</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/bad-name-2">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/bad-name-2</output-dir>
 +        <expected-error>Invalid format for property "exclude#"</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/bad-name-3">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/bad-name-3</output-dir>
 +        <expected-error>Invalid format for property "exclude#hello"</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/both">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/both</output-dir>
 +        <expected-error>The parameters "include" and "exclude" cannot be provided at the same time</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-all">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-all</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-1">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-1</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-2">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-2</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-3">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-3</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-4">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-4</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-5">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-5</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/exclude-6">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/exclude-6</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-all">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-all</output-dir>
 +        <expected-error>Malformed input stream</expected-error>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-1">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-1</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-2">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-2</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-3">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-3</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-4">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-4</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-5">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-5</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-6">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-6</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-7">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-7</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-8">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-8</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-9">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-9</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-10">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-10</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-11">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-11</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +    <test-case FilePath="external-dataset">
 +      <compilation-unit name="common/include-exclude/include-12">
 +        <placeholder name="adapter" value="S3" />
 +        <output-dir compare="Text">common/include-exclude/include-12</output-dir>
 +      </compilation-unit>
 +    </test-case>
 +  </test-group>
 +</test-suite>
diff --cc asterixdb/pom.xml
index e38ae81,8c78dfc..ca0f509
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -76,20 -76,14 +76,20 @@@
      <itest.excludes>${global.itest.excludes}</itest.excludes>
      <license.stage>compile</license.stage>
      <resource.stage>process-classes</resource.stage>
 +    <prepare-env.stage>none</prepare-env.stage>
 +    <shim.stage>none</shim.stage>
 +    <pytestlib.stage>none</pytestlib.stage>
 +    <skip-npm-touch.stage>none</skip-npm-touch.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via properties -->
 -    <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
 +    <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
      <hadoop.version>2.8.5</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
-     <log4j.version>2.14.1</log4j.version>
-     <awsjavasdk.version>2.10.83</awsjavasdk.version>
+     <log4j.version>2.17.1</log4j.version>
+     <awsjavasdk.version>2.17.116</awsjavasdk.version>
 +    <azurejavasdk.version>12.12.0</azurejavasdk.version>
 +    <parquet.version>1.8.2</parquet.version>
  
      <implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index 2368f2f,d7298e0..d6c8e73
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -172,9 -184,9 +184,9 @@@
        <artifactId>netty-transport-native-unix-common</artifactId>
        <properties>
          <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-         <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
-         <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
-         <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
 -        <license.ignoreMissingEmbeddedLicense>4.1.72.Final</license.ignoreMissingEmbeddedLicense>
 -        <license.ignoreMissingEmbeddedNotice>4.1.72.Final</license.ignoreMissingEmbeddedNotice>
 -        <license.ignoreNoticeOverride>4.1.712.Final</license.ignoreNoticeOverride>
++        <license.ignoreMissingEmbeddedLicense>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedLicense>
++        <license.ignoreMissingEmbeddedNotice>4.1.72.Final,4.1.73.Final</license.ignoreMissingEmbeddedNotice>
++        <license.ignoreNoticeOverride>4.1.72.Final,4.1.73.Final</license.ignoreNoticeOverride>
        </properties>
      </project>
    </supplement>
@@@ -193,30 -205,6 +205,30 @@@
    <supplement>
      <project>
        <groupId>io.netty</groupId>
 +      <artifactId>netty-codec-dns</artifactId>
 +      <properties>
 +        <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-         <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
-         <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
-         <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
++        <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
++        <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
++        <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
 +      </properties>
 +    </project>
 +  </supplement>
 +  <supplement>
 +    <project>
 +      <groupId>io.netty</groupId>
 +      <artifactId>netty-codec-http2</artifactId>
 +      <properties>
 +        <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-         <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
-         <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
-         <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
++        <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
++        <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
++        <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
 +      </properties>
 +    </project>
 +  </supplement>
 +  <supplement>
 +    <project>
 +      <groupId>io.netty</groupId>
        <artifactId>netty-handler</artifactId>
        <properties>
          <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
@@@ -276,18 -264,6 +288,18 @@@
    </supplement>
    <supplement>
      <project>
 +      <groupId>io.netty</groupId>
 +      <artifactId>netty-resolver-dns</artifactId>
 +      <properties>
 +        <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-         <license.ignoreMissingEmbeddedLicense>4.1.69.Final</license.ignoreMissingEmbeddedLicense>
-         <license.ignoreMissingEmbeddedNotice>4.1.69.Final</license.ignoreMissingEmbeddedNotice>
-         <license.ignoreNoticeOverride>4.1.69.Final</license.ignoreNoticeOverride>
++        <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense>
++        <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice>
++        <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride>
 +      </properties>
 +    </project>
 +  </supplement>
 +  <supplement>
 +    <project>
        <groupId>com.google.guava</groupId>
        <artifactId>guava</artifactId>
        <properties>
diff --cc hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index d418548,a35f816..2899cf7
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@@ -135,9 -134,9 +135,13 @@@
        <scope>test</scope>
        <exclusions>
          <exclusion>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-all</artifactId>
+         </exclusion>
++        <exclusion>
 +          <groupId>log4j</groupId>
 +          <artifactId>log4j</artifactId>
 +        </exclusion>
        </exclusions>
      </dependency>
      <dependency>
diff --cc hyracks-fullstack/pom.xml
index 11dc49a,014a1a3..c2f553a
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -111,27 -111,12 +111,27 @@@
        <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-handler</artifactId>
-         <version>4.1.69.Final</version>
+         <version>4.1.73.Final</version>
        </dependency>
        <dependency>
 +        <groupId>io.netty</groupId>
 +        <artifactId>netty-resolver-dns</artifactId>
-         <version>4.1.69.Final</version>
++        <version>4.1.73.Final</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>io.netty</groupId>
 +        <artifactId>netty-codec-http2</artifactId>
-         <version>4.1.69.Final</version>
++        <version>4.1.73.Final</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>io.netty</groupId>
 +        <artifactId>netty-transport-native-unix-common</artifactId>
-         <version>4.1.69.Final</version>
++        <version>4.1.73.Final</version>
 +      </dependency>
 +      <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
-         <version>4.13</version>
+         <version>4.13.2</version>
        </dependency>
        <dependency>
          <groupId>org.apache.hadoop</groupId>
@@@ -172,9 -153,9 +172,13 @@@
          <version>${hadoop.version}</version>
          <exclusions>
            <exclusion>
+             <groupId>io.netty</groupId>
+             <artifactId>netty-all</artifactId>
+           </exclusion>
++          <exclusion>
 +            <groupId>log4j</groupId>
 +            <artifactId>log4j</artifactId>
 +          </exclusion>
          </exclusions>
        </dependency>
        <dependency>