This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 4af9e73bb6797c5a731d3394a628c92dd72440ff Merge: bbd01f4e93 ed179228db Author: Michael Blow <[email protected]> AuthorDate: Thu Oct 27 14:30:26 2022 -0400 Merge branch 'gerrit/mad-hatter' Change-Id: I040680f9652d56d4691923d1e2c9e6f0371994b5 .../appended-resources/supplemental-models.xml | 86 ++++++++++++---------- ....com_netty_netty_netty-4.1.84.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 26 +++---- 3 files changed, 62 insertions(+), 50 deletions(-) diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index f5a0d1dd73,d0703ffd78..8458724bdc --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -202,30 -202,6 +202,30 @@@ </properties> </project> </supplement> + <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.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.84.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.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> <supplement> <project> <groupId>io.netty</groupId> @@@ -286,15 -262,15 +286,27 @@@ </properties> </project> </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.78.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.78.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.78.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> ++ </properties> ++ </project> ++ </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <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.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> diff --cc hyracks-fullstack/pom.xml index 86f0ef5ac1,7a7c0b0bec..1ca6b2a050 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -116,23 -116,8 +116,23 @@@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-classes-epoll</artifactId> - <version>4.1.78.Final</version> + <version>4.1.84.Final</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> - <version>4.1.78.Final</version> ++ <version>4.1.84.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> - <version>4.1.78.Final</version> ++ <version>4.1.84.Final</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> - <version>4.1.78.Final</version> ++ <version>4.1.84.Final</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
