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 c1a1742a1f546de015b1a65d78b3b559dc427876 Merge: 04b1dd4f41 1e5910e2df Author: Michael Blow <[email protected]> AuthorDate: Tue Jul 25 11:03:07 2023 -0400 Merge branch 'gerrit/cheshire-cat' into 'gerrit/neo' Change-Id: I7fcd4f954796bafa7f9452306c5b5e6eb3a540e6 .../appended-resources/supplemental-models.xml | 90 +++++++++++----------- ....com_netty_netty_netty-4.1.94.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 17 +++- 3 files changed, 61 insertions(+), 46 deletions(-) diff --cc hyracks-fullstack/pom.xml index 843167a470,76f7b10441..7070ca605b --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -70,13 -70,13 +70,13 @@@ <test.includes>${global.test.includes}</test.includes> <test.excludes>${global.test.excludes}</test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> - <hadoop.version>2.8.5</hadoop.version> + <hadoop.version>3.3.1</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> - <snappy.version>1.1.8.4</snappy.version> - <jackson.version>2.14.1</jackson.version> + <snappy.version>1.1.10.1</snappy.version> + <jackson.version>2.14.3</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> @@@ -110,6 -110,6 +110,16 @@@ <artifactId>netty-codec</artifactId> <version>${netty.version}</version> </dependency> ++ <dependency> ++ <groupId>io.netty</groupId> ++ <artifactId>netty-codec-dns</artifactId> ++ <version>${netty.version}</version> ++ </dependency> ++ <dependency> ++ <groupId>io.netty</groupId> ++ <artifactId>netty-codec-socks</artifactId> ++ <version>${netty.version}</version> ++ </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> @@@ -125,6 -125,6 +135,11 @@@ <artifactId>netty-transport-classes-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>
