From fd3e6db97e5d1ed2c4c33195f28a4cf8bdf251a8 Mon Sep 17 00:00:00 2001
From: Joe Lauer <joe@lauer.bz>
Date: Mon, 4 Nov 2024 15:09:20 -0500
Subject: [PATCH] Bump JNA to v5.13.0 (to fix ssh agent on macos arm, etc)

---
 blaze-ssh/pom.xml | 19 +++++++++++++++++++
 pom.xml           | 12 ++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/blaze-ssh/pom.xml b/blaze-ssh/pom.xml
index d5bb3a90..ed9876b0 100644
--- a/blaze-ssh/pom.xml
+++ b/blaze-ssh/pom.xml
@@ -50,6 +50,7 @@
             </exclusions>
         </dependency>
 
+        <!-- this pulls in an old JNA, fix it -->
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch.agentproxy.usocket-jna</artifactId>
@@ -58,8 +59,26 @@
                     <groupId>com.jcraft</groupId>
                     <artifactId>jsch</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jna</groupId>
+                    <artifactId>jna-platform</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna-platform</artifactId>
+        </dependency>
         
         <!--
         <dependency>
diff --git a/pom.xml b/pom.xml
index 9e0d866d..05eab5f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,18 @@
                 </exclusions>
             </dependency>
 
+            <!-- use better JNA version for improved platform support as opposed to what jsch-agentproxy is pulling in -->
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>5.13.0</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>5.13.0</version>
+            </dependency>
+
             <!-- blaze-vagrant dependencies -->
             <dependency>
                 <groupId>com.fizzed</groupId>