You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by al...@apache.org on 2022/11/02 16:43:44 UTC
[asterixdb] 05/08: Merge branch 'gerrit/stabilization-5949a1cb71'
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 ed179228db36b45913be38a1cd7ae466fe9d5de7
Merge: d4e4a17bf9 a0ae04de29
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Oct 27 09:41:52 2022 -0400
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I02f073515a835b073ed56ca90cadfc6f66cbf7c1
.../appended-resources/supplemental-models.xml | 68 +++++++++++++---------
....com_netty_netty_netty-4.1.84.Final_NOTICE.txt} | 0
hyracks-fullstack/pom.xml | 20 +++----
3 files changed, 50 insertions(+), 38 deletions(-)
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index b16967dad7,29a610aa0d..d0703ffd78
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -166,30 -166,6 +166,30 @@@
</properties>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</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.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>
diff --cc hyracks-fullstack/pom.xml
index 2016cde975,1db1b8f178..7a7c0b0bec
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -111,13 -110,8 +111,13 @@@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.78.Final</version>
+ <version>4.1.84.Final</version>
</dependency>
+ <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>junit</groupId>
<artifactId>junit</artifactId>