Bump JNA to v5.13.0 (to fix ssh agent on macos arm, etc)

fizzed · Nov 4, 2024 · fd3e6db · fd3e6db
1 parent c42c027
commit fd3e6db
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git 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
@@ -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>