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 2025/06/01 15:01:55 UTC
(asterixdb) 09/19: Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
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 141253929c63a90ac7cbd9ca728a23275e8b1c88
Merge: bc66d5dcf4 1e12c3c74f
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue May 20 21:50:34 2025 -0400
Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
Ext-ref: MB-66739
Change-Id: I942b715f9c1feaab0592a6fcffa750451764a374
asterixdb/asterix-external-data/pom.xml | 5 -
asterixdb/pom.xml | 225 ++-----------------------
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 +-
hyracks-fullstack/pom.xml | 97 ++++++++++-
4 files changed, 103 insertions(+), 228 deletions(-)
diff --cc asterixdb/pom.xml
index 9d66b79a40,aa048c6de2..597c529f39
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -1072,10 -1084,10 +1072,14 @@@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@@ -1146,14 -1166,6 +1150,10 @@@
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --cc hyracks-fullstack/pom.xml
index 45e97c4090,00cc2e5927..13bdc6f2b2
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -74,9 -74,9 +74,9 @@@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<snappy.version>1.1.10.5</snappy.version>
- <jackson.version>2.14.1</jackson.version>
+ <jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
- <netty.version>4.1.115.Final</netty.version>
+ <netty.version>4.1.121.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@@ -140,14 -203,10 +213,15 @@@
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>linux-x86_64</classifier>
<version>${netty.version}</version>
</dependency>
<dependency>
@@@ -215,17 -289,9 +300,13 @@@
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</exclusion>
</exclusions>
</dependency>