From 54ec15c5884db8e0dba5d412c5fa19d960828f85 Mon Sep 17 00:00:00 2001
From: Oscar Westra van Holthe - Kind <opwvhk@apache.org>
Date: Wed, 11 Jun 2025 13:16:14 +0200
Subject: [PATCH 1/2] AVRO-4153: Add dependency to netty-codec

---
 lang/java/ipc-netty/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lang/java/ipc-netty/pom.xml b/lang/java/ipc-netty/pom.xml
index be5ab63d850..420a96116b6 100644
--- a/lang/java/ipc-netty/pom.xml
+++ b/lang/java/ipc-netty/pom.xml
@@ -121,6 +121,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
 
 
   </dependencies>

From aaee2531b2049e3b473dcb4764473fdefdf6b403 Mon Sep 17 00:00:00 2001
From: Oscar Westra van Holthe - Kind <opwvhk@apache.org>
Date: Wed, 11 Jun 2025 13:16:28 +0200
Subject: [PATCH 2/2] AVRO-4153: Upgrade netty to 4.2.2.Final

---
 .../apache/avro/ipc/netty/TestNettyServerWithCompression.java   | 2 +-
 lang/java/pom.xml                                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/java/ipc-netty/src/test/java/org/apache/avro/ipc/netty/TestNettyServerWithCompression.java b/lang/java/ipc-netty/src/test/java/org/apache/avro/ipc/netty/TestNettyServerWithCompression.java
index 3b6a2b41ef8..5bbfeb8c6b4 100644
--- a/lang/java/ipc-netty/src/test/java/org/apache/avro/ipc/netty/TestNettyServerWithCompression.java
+++ b/lang/java/ipc-netty/src/test/java/org/apache/avro/ipc/netty/TestNettyServerWithCompression.java
@@ -31,7 +31,7 @@ public class TestNettyServerWithCompression extends TestNettyServer {
   public static void initializeConnections() throws Exception {
     initializeConnections(ch -> {
       ch.pipeline().addFirst("deflater", new JdkZlibEncoder(6));
-      ch.pipeline().addFirst("inflater", new JdkZlibDecoder());
+      ch.pipeline().addFirst("inflater", new JdkZlibDecoder(0));
     });
   }
 
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 961b6660c7b..5b8063a2938 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -51,7 +51,7 @@
     <junit5.version>5.13.1</junit5.version>
     <maven-core.version>3.9.6</maven-core.version>
     <mockito.version>5.18.0</mockito.version>
-    <netty.version>4.2.0.Final</netty.version>
+    <netty.version>4.2.2.Final</netty.version>
     <protobuf.version>4.31.1</protobuf.version>
     <reload4j.version>1.2.26</reload4j.version>
     <servlet-api.version>4.0.1</servlet-api.version>