This is an automated email from the ASF dual-hosted git repository. ritik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit b1e270e0f5354345a4c41abe41902b42071f1290 Merge: eebf977d4e 7b8a94cdb9 Author: Michael Blow <[email protected]> AuthorDate: Sat Feb 22 08:17:45 2025 -0500 Merge branch 'gerrit/morpheus' into 'master' Ext-ref: MB-65226 Change-Id: If65ef6e3bf21d776a3954fa6dc08c44a2c623131 .../external/library/ExternalLibraryManager.java | 8 ++-- .../apache/asterix/metadata/RMIClientFactory.java | 2 +- .../apache/asterix/metadata/RMIServerFactory.java | 2 +- hyracks-fullstack/hyracks/hyracks-api/pom.xml | 4 ++ .../api/network/INetworkSecurityConfig.java | 47 +++++++++++++++--- .../api/network/INetworkSecurityManager.java | 4 +- hyracks-fullstack/hyracks/hyracks-ipc/pom.xml | 4 ++ .../ipc/security/NetworkSecurityConfig.java | 35 ++++++++++++-- .../ipc/security/NetworkSecurityManager.java | 56 +++++++++++----------- .../ipc/sockets/SslSocketChannelFactory.java | 6 +-- 10 files changed, 117 insertions(+), 51 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-api/pom.xml index b8e8c4e94c,eee03f3570..52f47f9dcc --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml @@@ -105,9 -105,9 +105,13 @@@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </dependency> </dependencies> </project>
