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 2023/01/27 14:19:35 UTC
[asterixdb] 05/10: Merge branch 'gerrit/stabilization-5949a1cb71'
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 85a3f577dfa61bc14a75c0b5fc1b6cbb349f1253
Merge: d7e54cf144 2c076aa73f
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Jan 12 23:22:31 2023 -0500
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I8f1e00fb22ec140766e2f9dd6dfaf6b2bfbffa0e
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 70 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
hyracks-fullstack/pom.xml | 28 +++++----
9 files changed, 54 insertions(+), 53 deletions(-)
diff --cc asterixdb/pom.xml
index 2bec4b7013,15dc445c92..2975dc9c89
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -82,8 -81,7 +82,8 @@@
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
+ <awsjavasdk.version>2.17.218</awsjavasdk.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 d0703ffd78,605bac1a6e..5e871f2bb0
--- 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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
diff --cc hyracks-fullstack/pom.xml
index 7a7c0b0bec,1b4d1f01cd..5e07d9be9d
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -111,13 -111,8 +112,13 @@@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.84.Final</version>
++ <version>4.1.87.Final</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>