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 1e5910e2df64d1527d1a776c273451cc83254f8b Merge: 35c42acd3c 84c47cf88a Author: Michael Blow <[email protected]> AuthorDate: Wed Jul 19 09:10:05 2023 -0400 Merge branch 'gerrit/mad-hatter' into 'gerrit/cheshire-cat' Change-Id: Ibc4d62ded50996c714419d90dadb833c5866dec0 .../appended-resources/supplemental-models.xml | 90 +++++++++++----------- ....com_netty_netty_netty-4.1.94.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml index 2300c925d0,5e871f2bb0..6a0f8d0884 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@@ -160,9 -160,9 +160,9 @@@ <artifactId>netty-transport</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -172,9 -172,9 +172,9 @@@ <artifactId>netty-transport-classes-epoll</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -184,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.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -196,45 -196,9 +196,45 @@@ <artifactId>netty-codec</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> + </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.87.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.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.87.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-codec-socks</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -244,21 -208,9 +244,21 @@@ <artifactId>netty-handler</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-handler-proxy</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -268,9 -220,9 +268,9 @@@ <artifactId>netty-buffer</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -280,9 -232,9 +280,9 @@@ <artifactId>netty-common</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -292,9 -244,9 +292,9 @@@ <artifactId>netty-codec-http</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -304,21 -256,9 +304,21 @@@ <artifactId>netty-resolver</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> -- <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> + </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.87.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@@ -328,9 -268,9 +328,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.87.Final</license.ignoreMissingEmbeddedLicense> -- <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice> -- <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride> ++ <license.ignoreMissingEmbeddedLicense>4.1.94.Final</license.ignoreMissingEmbeddedLicense> ++ <license.ignoreMissingEmbeddedNotice>4.1.94.Final</license.ignoreMissingEmbeddedNotice> ++ <license.ignoreNoticeOverride>4.1.94.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> diff --cc hyracks-fullstack/pom.xml index 9380fb181d,8311c5cfad..76f7b10441 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -76,7 -76,6 +76,7 @@@ <snappy.version>1.1.8.4</snappy.version> <jackson.version>2.14.1</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> - <netty.version>4.1.87.Final</netty.version> ++ <netty.version>4.1.94.Final</netty.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
