From 8d614406936bea5ab7a1549fd0ded922b797a51e Mon Sep 17 00:00:00 2001
From: Peter Quiring <pquiring@gmail.com>
Date: Tue, 14 Jan 2025 09:13:29 -0500
Subject: [PATCH] upgrade to netty/4.1.116

---
 build.xml                              |  6 ++++-
 get-jars.xml                           | 32 ++++++++++++++++++++++----
 install-jars.xml                       | 20 ++++++++++++++--
 src/javaforce/controls/Controller.java |  1 +
 versions.xml                           |  2 +-
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 15db8dac..ff7c17fc 100755
--- a/build.xml
+++ b/build.xml
@@ -106,7 +106,11 @@
     <antcall target="jar-xmlgraphics-commons"/>
     <antcall target="jar-xml-apis-ext"/>
     <antcall target="jar-commons-lang3"/>
-    <antcall target="jar-netty-all"/>
+    <antcall target="jar-netty-common"/>
+    <antcall target="jar-netty-buffer"/>
+    <antcall target="jar-netty-transport"/>
+    <antcall target="jar-netty-handler"/>
+    <antcall target="jar-netty-codec"/>
     <antcall target="jar-plc4j-api"/>
     <antcall target="jar-plc4j-spi"/>
     <antcall target="jar-plc4j-transport-tcp"/>
diff --git a/get-jars.xml b/get-jars.xml
index 1ac7bc60..d2568a1a 100644
--- a/get-jars.xml
+++ b/get-jars.xml
@@ -207,9 +207,29 @@
     <maven name="xml-apis-ext" path="xml-apis" version="${xml-apis-ext-version}"/>
   </target>
 
-  <available property="have-netty-all" file="${lib}/netty-all-${netty-version}.jar"/>
-  <target name="get-netty-all" unless="have-netty-all">
-    <maven name="netty-all" path="io/netty" version="${netty-version}"/>
+  <available property="have-netty-common" file="${lib}/netty-common-${netty-version}.jar"/>
+  <target name="get-netty-common" unless="have-netty-common">
+    <maven name="netty-common" path="io/netty" version="${netty-version}"/>
+  </target>
+
+  <available property="have-netty-buffer" file="${lib}/netty-buffer-${netty-version}.jar"/>
+  <target name="get-netty-buffer" unless="have-netty-buffer">
+    <maven name="netty-buffer" path="io/netty" version="${netty-version}"/>
+  </target>
+
+  <available property="have-netty-transport" file="${lib}/netty-transport-${netty-version}.jar"/>
+  <target name="get-netty-transport" unless="have-netty-transport">
+    <maven name="netty-transport" path="io/netty" version="${netty-version}"/>
+  </target>
+
+  <available property="have-netty-handler" file="${lib}/netty-handler-${netty-version}.jar"/>
+  <target name="get-netty-handler" unless="have-netty-handler">
+    <maven name="netty-handler" path="io/netty" version="${netty-version}"/>
+  </target>
+
+  <available property="have-netty-codec" file="${lib}/netty-codec-${netty-version}.jar"/>
+  <target name="get-netty-codec" unless="have-netty-codec">
+    <maven name="netty-codec" path="io/netty" version="${netty-version}"/>
   </target>
 
   <available property="have-plc4j-api" file="${lib}/plc4j-api-${plc4j-version}.jar"/>
@@ -279,7 +299,11 @@
     <antcall target="get-batik-all"/>
     <antcall target="get-xmlgraphics-commons"/>
     <antcall target="get-xml-apis-ext"/>
-    <antcall target="get-netty-all"/>
+    <antcall target="get-netty-common"/>
+    <antcall target="get-netty-buffer"/>
+    <antcall target="get-netty-transport"/>
+    <antcall target="get-netty-handler"/>
+    <antcall target="get-netty-codec"/>
     <antcall target="get-plc4j-api"/>
     <antcall target="get-plc4j-spi"/>
     <antcall target="get-plc4j-transport-tcp"/>
diff --git a/install-jars.xml b/install-jars.xml
index f235d889..9c89bc8d 100644
--- a/install-jars.xml
+++ b/install-jars.xml
@@ -165,8 +165,24 @@
     <copyjar name="xml-apis-ext" version="${xml-apis-ext-version}" path="${jarpath}"/>
   </target>
 
-  <target name="jar-netty-all">
-    <copyjar name="netty-all" version="${netty-version}" path="${jarpath}"/>
+  <target name="jar-netty-common">
+    <copyjar name="netty-common" version="${netty-version}" path="${jarpath}"/>
+  </target>
+
+  <target name="jar-netty-buffer">
+    <copyjar name="netty-buffer" version="${netty-version}" path="${jarpath}"/>
+  </target>
+
+  <target name="jar-netty-transport">
+    <copyjar name="netty-transport" version="${netty-version}" path="${jarpath}"/>
+  </target>
+
+  <target name="jar-netty-handler">
+    <copyjar name="netty-handler" version="${netty-version}" path="${jarpath}"/>
+  </target>
+
+  <target name="jar-netty-codec">
+    <copyjar name="netty-codec" version="${netty-version}" path="${jarpath}"/>
   </target>
 
   <target name="jar-plc4j-api">
diff --git a/src/javaforce/controls/Controller.java b/src/javaforce/controls/Controller.java
index f30fb0ee..19b55106 100755
--- a/src/javaforce/controls/Controller.java
+++ b/src/javaforce/controls/Controller.java
@@ -86,6 +86,7 @@ public boolean connect(String url) {
       if (!netty) {
         netty = true;
         JFLog.log("Disabling netty unsafe usage!");
+        System.setProperty("org.jboss.netty.debug", "true");
         System.setProperty("io.netty.allocator.numDirectArenas", "0");
         System.setProperty("io.netty.noPreferDirect", "true");
         System.setProperty("io.netty.noUnsafe", "true");
diff --git a/versions.xml b/versions.xml
index 3922d53c..a58a607c 100644
--- a/versions.xml
+++ b/versions.xml
@@ -34,5 +34,5 @@
   <property name="xmlgraphics-commons-version" value="2.8"/>
   <property name="xml-apis-ext-version" value="1.3.04"/>
   <property name="plc4j-version" value="0.12.0"/>
-  <property name="netty-version" value="4.1.63.Final"/>
+  <property name="netty-version" value="4.1.116.Final"/>
 </project>